Closes issue #23600: Wrong results from tzinfo.fromutc().
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index a942d4d..3d50fc1 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -180,6 +180,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 --git a/Misc/NEWS b/Misc/NEWS
index 6793215..63730fa 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,9 @@
Library
-------
+- Issue #23600: Default implementation of tzinfo.fromutc() was returning
+ wrong results in some cases.
+
- Issue #25203: Failed readline.set_completer_delims() no longer left the
module in inconsistent state.
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index cabe4ed..6084ffa 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -3040,7 +3040,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);