p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #28323 -- Removed unneeded normalize() in timezone.localtime() and make_naive().

This commit is contained in:
Tim Graham 2017-06-19 17:59:59 -04:00
parent d0f59054d0
commit bdf20c383f
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/utils/timezone.py
View File

@ -204,11 +204,7 @@ def localtime(value=None, timezone=None):
# Emulate the behavior of astimezone() on Python < 3.6.
if is_naive(value):
raise ValueError("localtime() cannot be applied to a naive datetime")
value = value.astimezone(timezone)
if hasattr(timezone, 'normalize'):
# This method is available for pytz time zones.
value = timezone.normalize(value)
return value
return value.astimezone(timezone)
def localdate(value=None, timezone=None):
@ -287,8 +283,4 @@ def make_naive(value, timezone=None):
# Emulate the behavior of astimezone() on Python < 3.6.
if is_naive(value):
raise ValueError("make_naive() cannot be applied to a naive datetime")
value = value.astimezone(timezone)
if hasattr(timezone, 'normalize'):
# This method is available for pytz time zones.
value = timezone.normalize(value)
return value.replace(tzinfo=None)
return value.astimezone(timezone).replace(tzinfo=None)