浏览代码

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

Jon Dufresne 7 年之前
父节点
当前提交
3c34452ab5
共有 3 个文件被更改,包括 3 次插入4 次删除
  1. 1 2
      django/forms/utils.py
  2. 1 1
      django/views/generic/dates.py
  3. 1 1
      tests/postgres_tests/test_ranges.py

+ 1 - 2
django/forms/utils.py

@@ -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

+ 1 - 1
django/views/generic/dates.py

@@ -267,7 +267,7 @@ class DateMixin:
         if self.uses_datetime_field:
             value = datetime.datetime.combine(value, datetime.time.min)
             if settings.USE_TZ:
-                value = timezone.make_aware(value, timezone.get_current_timezone())
+                value = timezone.make_aware(value)
         return value
 
     def _make_single_date_lookup(self, date):

+ 1 - 1
tests/postgres_tests/test_ranges.py

@@ -100,7 +100,7 @@ class TestRangeContainsLookup(PostgreSQLTestCase):
             datetime.datetime(year=2016, month=2, day=2),
         ]
         cls.aware_timestamps = [
-            timezone.make_aware(timestamp, timezone.get_current_timezone())
+            timezone.make_aware(timestamp)
             for timestamp in cls.timestamps
         ]
         cls.dates = [