Kaydet (Commit) bdf20c38 authored tarafından Tim Graham's avatar Tim Graham

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

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