summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2006-06-21 11:11:03 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2006-06-21 11:11:03 +0000
commitae1234f2a2e6956fe26ca80743e296cff84e08d5 (patch)
treef44608488760c0f8a5b11290be25de5f292b00f9 /django/utils
parent239adf83d33c47ea6dd961904d79962cd7e5a65c (diff)
Fixed #2163 -- Corrected typo when handling datetimes with timezones in the timesince filter. Thanks, Alex Dedul.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/timesince.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/timesince.py b/django/utils/timesince.py
index 0b94d89bc6..e69c45c8c1 100644
--- a/django/utils/timesince.py
+++ b/django/utils/timesince.py
@@ -24,7 +24,7 @@ def timesince(d, now=None):
else:
t = time.localtime()
if d.tzinfo:
- tz = LocalTimezone()
+ tz = LocalTimezone(d)
else:
tz = None
now = datetime.datetime(t[0], t[1], t[2], t[3], t[4], t[5], tzinfo=tz)