summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2008-08-28 16:31:50 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2008-08-28 16:31:50 +0000
commit82179ccbbb69dfc3c2d2822683809c4a2beb9021 (patch)
tree07252c54a592383738cbf0e47d8396309b406741
parent2e7a87c53c0d010f72f7f71c570f2c1e00ec92bd (diff)
Fixed #8637: fixed timeuntil and date values.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-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 1ce3550580..1142e00d29 100644
--- a/django/utils/timesince.py
+++ b/django/utils/timesince.py
@@ -60,7 +60,7 @@ def timeuntil(d, now=None):
the given time.
"""
if not now:
- if d.tzinfo:
+ if getattr(d, 'tzinfo', None):
now = datetime.datetime.now(LocalTimezone(d))
else:
now = datetime.datetime.now()