Fixed #8637: fixed timeuntil and date values.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
2e7a87c53c
commit
82179ccbbb
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue