bpo-37372: Fix error unpickling datetime.time objects from Python 2 with seconds>=24. (GH-14307)

miss-islington · UncombedCoconut · web-flow · commit d1d42bf4a404 · 2019-08-29T00:56:04.000-07:00
(cherry picked from commit 122376d) Co-authored-by: Justin Blanchard <UncombedCoconut@gmail.com>
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
@@ -3324,16 +3324,25 @@ def test_pickling_subclass_time(self):
 
     def test_compat_unpickle(self):
         tests = [
-            b"cdatetime\ntime\n(S'\\x14;\\x10\\x00\\x10\\x00'\ntR.",
-            b'cdatetime\ntime\n(U\x06\x14;\x10\x00\x10\x00tR.',
-            b'\x80\x02cdatetime\ntime\nU\x06\x14;\x10\x00\x10\x00\x85R.',
+            (b"cdatetime\ntime\n(S'\\x14;\\x10\\x00\\x10\\x00'\ntR.",
+             (20, 59, 16, 64**2)),
+            (b'cdatetime\ntime\n(U\x06\x14;\x10\x00\x10\x00tR.',
+             (20, 59, 16, 64**2)),
+            (b'\x80\x02cdatetime\ntime\nU\x06\x14;\x10\x00\x10\x00\x85R.',
+             (20, 59, 16, 64**2)),
+            (b"cdatetime\ntime\n(S'\\x14;\\x19\\x00\\x10\\x00'\ntR.",
+             (20, 59, 25, 64**2)),
+            (b'cdatetime\ntime\n(U\x06\x14;\x19\x00\x10\x00tR.',
+             (20, 59, 25, 64**2)),
+            (b'\x80\x02cdatetime\ntime\nU\x06\x14;\x19\x00\x10\x00\x85R.',
+             (20, 59, 25, 64**2)),
         ]
-        args = 20, 59, 16, 64**2
-        expected = self.theclass(*args)
-        for data in tests:
-            for loads in pickle_loads:
-                derived = loads(data, encoding='latin1')
-                self.assertEqual(derived, expected)
+        for i, (data, args) in enumerate(tests):
+            with self.subTest(i=i):
+                expected = self.theclass(*args)
+                for loads in pickle_loads:
+                    derived = loads(data, encoding='latin1')
+                    self.assertEqual(derived, expected)
 
     def test_bool(self):
         # time is always True.
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -162,6 +162,7 @@ Roy Bixler
 Daniel Black
 Jonathan Black
 Renaud Blanch
+Justin Blanchard
 Mike Bland
 Martin Bless
 Pablo Bleyer
diff --git a/Misc/NEWS.d/next/Library/2019-06-22-12-30-00.bpo-37372.kIKqZ6.rst b/Misc/NEWS.d/next/Library/2019-06-22-12-30-00.bpo-37372.kIKqZ6.rst
@@ -0,0 +1,2 @@
+Fix error unpickling datetime.time objects from Python 2 with seconds>=24.
+Patch by Justin Blanchard.
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
@@ -4081,7 +4081,7 @@ time_new(PyTypeObject *type, PyObject *args, PyObject *kw)
                 return NULL;
             }
             if (PyUnicode_GET_LENGTH(state) == _PyDateTime_TIME_DATASIZE &&
-                (0x7F & PyUnicode_READ_CHAR(state, 2)) < 24)
+                (0x7F & PyUnicode_READ_CHAR(state, 0)) < 24)
             {
                 state = PyUnicode_AsLatin1String(state);
                 if (state == NULL) {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix error unpickling datetime.time objects from Python 2 with seconds>=24.`
	`2`	`+Patch by Justin Blanchard.`
Original file line number	Diff line number	Diff line change
`@@ -4081,7 +4081,7 @@ time_new(PyTypeObject type, PyObject args, PyObject *kw)`
`4081`	`4081`	`return NULL;`
`4082`	`4082`	`}`
`4083`	`4083`	`if (PyUnicode_GET_LENGTH(state) == _PyDateTime_TIME_DATASIZE &&`
`4084`		`- (0x7F & PyUnicode_READ_CHAR(state, 2)) < 24)`
	`4084`	`+ (0x7F & PyUnicode_READ_CHAR(state, 0)) < 24)`
`4085`	`4085`	`{`
`4086`	`4086`	`state = PyUnicode_AsLatin1String(state);`
`4087`	`4087`	`if (state == NULL) {`