Kaydet (Commit) 82179ccb authored tarafından Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss

Fixed #8637: fixed timeuntil and date values.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
üst 2e7a87c5
......@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment