Florian Apolloner committed b79f9f2

Add support for timezones in Django1.4

Comments (0)

Files changed (1)


 from django.utils.hashcompat import sha_constructor
 from django.utils.translation import ugettext_lazy as _
+    from django.utils.timezone import now as datetime_now
+except ImportError:
+    datetime_now =
 SHA1_RE = re.compile('^[a-f0-9]{40}$')
         expiration_date = datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS)
         return self.activation_key == self.ACTIVATED or \
-               (self.user.date_joined + expiration_date <=
+               (self.user.date_joined + expiration_date <= datetime_now())
     activation_key_expired.boolean = True
     def send_activation_email(self, site):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.