Commits

cborgolte  committed 0f892a6

Fix for comparing offset-naive and offset-aware datetimes

  • Participants
  • Parent commits fad7080

Comments (0)

Files changed (1)

File 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.datetime.now())
+               (self.user.date_joined + expiration_date <= datetime.datetime.now(self.user.date_joined.tzinfo))
     activation_key_expired.boolean = True
 
     def send_activation_email(self, site):