1
0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00

Refs #23668 -- Removed passing default argument of current TZ to make_aware()/naive.

This commit is contained in:
Jon Dufresne
2018-01-18 08:21:12 -08:00
committed by Tim Graham
parent 65728550bd
commit 3c34452ab5
3 changed files with 3 additions and 4 deletions

View File

@@ -174,6 +174,5 @@ def to_current_timezone(value):
to naive datetimes in the current time zone for display.
"""
if settings.USE_TZ and value is not None and timezone.is_aware(value):
current_timezone = timezone.get_current_timezone()
return timezone.make_naive(value, current_timezone)
return timezone.make_naive(value)
return value