Changeset 3186

Timestamp:

06/21/06 06:11:03 (2 years ago)

Author:

mtredinnick

Message:

Fixed #2163 -- Corrected typo when handling datetimes with timezones in the timesince filter. Thanks, Alex Dedul.

Files:

• django/trunk/django/utils/timesince.py (modified) (1 diff)
• django/trunk/tests/othertests/templates.py (modified) (3 diffs)

django/trunk/django/utils/timesince.py

@@ -25 +25 @@
-        t = time.localtime()
-    if d.tzinfo:
-
+d
-    else:
-        tz = None

django/trunk/tests/othertests/templates.py

@@ -5 +5 @@
-from django.template import loader
-from django.utils.translation import activate, deactivate, install
+from django.utils.tzinfo import LocalTimezone
-from datetime import datetime, timedelta
-import traceback
@@ -58 +59 @@
-        return "OtherClass.method"
-
-
+and NOW_tz are 
-NOW = datetime.now()
+NOW_tz = datetime.now(LocalTimezone(datetime.now()))
-
-# SYNTAX --
@@ -545 +547 @@
-    'timesince04' : ('{{ a|timesince:b }}', {'a':NOW + timedelta(days=2), 'b':NOW + timedelta(days=1)}, '1 day'),
-    'timesince05' : ('{{ a|timesince:b }}', {'a':NOW + timedelta(days=2), 'b':NOW + timedelta(days=2)}, '0 minutes'),
+
+    # Check that timezone is respected
+    'timesince06' : ('{{ a|timesince:b }}', {'a':NOW_tz + timedelta(hours=8), 'b':NOW_tz}, '8 hours'),
-
-    ### TIMEUNTIL TAG ##################################################