diff --git a/django/utils/timezone.py b/django/utils/timezone.py index 6d6cbf6d8ffd..fa31e854cb5d 100644 --- a/django/utils/timezone.py +++ b/django/utils/timezone.py @@ -178,9 +178,6 @@ def localtime(value=None, timezone=None): value = now() if timezone is None: timezone = get_current_timezone() - # Emulate the behavior of astimezone() on Python < 3.6. - if is_naive(value): - raise ValueError("localtime() cannot be applied to a naive datetime") return value.astimezone(timezone) @@ -249,9 +246,6 @@ def make_naive(value, timezone=None): """Make an aware datetime.datetime naive in a given time zone.""" if timezone is None: timezone = get_current_timezone() - # Emulate the behavior of astimezone() on Python < 3.6. - if is_naive(value): - raise ValueError("make_naive() cannot be applied to a naive datetime") return value.astimezone(timezone).replace(tzinfo=None) diff --git a/tests/utils_tests/test_timezone.py b/tests/utils_tests/test_timezone.py index 01e47aa08a10..5c3c0ed25185 100644 --- a/tests/utils_tests/test_timezone.py +++ b/tests/utils_tests/test_timezone.py @@ -22,16 +22,6 @@ def test_now(self): self.assertTrue(timezone.is_naive(timezone.now())) def test_localdate(self): - naive = datetime.datetime(2015, 1, 1, 0, 0, 1) - with self.assertRaisesMessage( - ValueError, "localtime() cannot be applied to a naive datetime" - ): - timezone.localdate(naive) - with self.assertRaisesMessage( - ValueError, "localtime() cannot be applied to a naive datetime" - ): - timezone.localdate(naive, timezone=EAT) - aware = datetime.datetime(2015, 1, 1, 0, 0, 1, tzinfo=ICT) self.assertEqual( timezone.localdate(aware, timezone=EAT), datetime.date(2014, 12, 31) @@ -149,11 +139,6 @@ def test_make_naive(self): datetime.datetime(2011, 9, 1, 13, 20, 30), ) - with self.assertRaisesMessage( - ValueError, "make_naive() cannot be applied to a naive datetime" - ): - timezone.make_naive(datetime.datetime(2011, 9, 1, 13, 20, 30), EAT) - def test_make_naive_no_tz(self): self.assertEqual( timezone.make_naive(datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT)),