changeset:   98336:4879c10ce982
parent:      98329:af46be655a2e
parent:      98335:c706c062f545
user:        Alexander Belopolsky <alexander.belopolsky@gmail.com>
date:        Sun Sep 27 21:56:53 2015 -0400
files:       Lib/test/datetimetester.py Misc/NEWS Modules/_datetimemodule.c
description:
Closes issue #23600: Wrong results from tzinfo.fromutc().


diff -r af46be655a2e -r 4879c10ce982 Lib/test/datetimetester.py
--- a/Lib/test/datetimetester.py	Sun Sep 27 12:37:20 2015 -0400
+++ b/Lib/test/datetimetester.py	Sun Sep 27 21:56:53 2015 -0400
@@ -192,6 +192,29 @@
                 self.assertEqual(derived.utcoffset(None), offset)
                 self.assertEqual(derived.tzname(None), oname)
 
+    def test_issue23600(self):
+        DSTDIFF = DSTOFFSET = timedelta(hours=1)
+
+        class UKSummerTime(tzinfo):
+            """Simple time zone which pretends to always be in summer time, since
+                that's what shows the failure.
+            """
+
+            def utcoffset(self, dt):
+                return DSTOFFSET
+
+            def dst(self, dt):
+                return DSTDIFF
+
+            def tzname(self, dt):
+                return 'UKSummerTime'
+
+        tz = UKSummerTime()
+        u = datetime(2014, 4, 26, 12, 1, tzinfo=tz)
+        t = tz.fromutc(u)
+        self.assertEqual(t - t.utcoffset(), u)
+
+
 class TestTimeZone(unittest.TestCase):
 
     def setUp(self):
diff -r af46be655a2e -r 4879c10ce982 Misc/NEWS
--- a/Misc/NEWS	Sun Sep 27 12:37:20 2015 -0400
+++ b/Misc/NEWS	Sun Sep 27 21:56:53 2015 -0400
@@ -146,6 +146,9 @@
 Library
 -------
 
+- Issue #23600: Default implementation of tzinfo.fromutc() was returning
+  wrong results in some cases.
+
 - Issue #23329: Allow the ssl module to be built with older versions of
   LibreSSL.
 
diff -r af46be655a2e -r 4879c10ce982 Modules/_datetimemodule.c
--- a/Modules/_datetimemodule.c	Sun Sep 27 12:37:20 2015 -0400
+++ b/Modules/_datetimemodule.c	Sun Sep 27 21:56:53 2015 -0400
@@ -3046,7 +3046,7 @@
         goto Fail;
     if (dst == Py_None)
         goto Inconsistent;
-    if (delta_bool(delta) != 0) {
+    if (delta_bool((PyDateTime_Delta *)dst) != 0) {
         PyObject *temp = result;
         result = add_datetime_timedelta((PyDateTime_DateTime *)result,
                                         (PyDateTime_Delta *)dst, 1);