Commits

David Marble committed 5da97c0 Merge

merge timezone removal on expiration check for mongo

Comments (0)

Files changed (1)

registration/models.py

         """
         expiration_date = datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS)
         return self.activation_key == self.ACTIVATED or \
-               (self.user.date_joined + expiration_date <= datetime_now())
+               (self.user.date_joined.replace(tzinfo=None) + expiration_date <= datetime.datetime.now())
     activation_key_expired.boolean = True
 
     def send_activation_email(self, site):