From e43ea36b7681e43ea99505a2cf7550d4d36016b3 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 17 Sep 2016 12:12:52 -0400 Subject: [PATCH] Refs #27025 -- Fixed a timezone test for Python 3.6. Reflects behavior changes in PEP 495 (Local Time Disambiguation). --- tests/utils_tests/test_timezone.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/utils_tests/test_timezone.py b/tests/utils_tests/test_timezone.py index 9dc7941b4b..1be1d63b2c 100644 --- a/tests/utils_tests/test_timezone.py +++ b/tests/utils_tests/test_timezone.py @@ -193,8 +193,14 @@ class TimezoneTests(SimpleTestCase): pytz.timezone("Asia/Bangkok").localize(datetime.datetime(2011, 9, 1, 17, 20, 30)), CET ), datetime.datetime(2011, 9, 1, 12, 20, 30)) - with self.assertRaises(ValueError): - timezone.make_naive(datetime.datetime(2011, 9, 1, 12, 20, 30), CET) + if PY36: + self.assertEqual( + timezone.make_naive(datetime.datetime(2011, 9, 1, 12, 20, 30), CET), + datetime.datetime(2011, 9, 1, 19, 20, 30) + ) + else: + with self.assertRaises(ValueError): + timezone.make_naive(datetime.datetime(2011, 9, 1, 12, 20, 30), CET) @requires_pytz def test_make_aware_pytz_ambiguous(self):