bpo-41966: Fix pickling pure datetime.time subclasses (GH-22731) (GH-22748)

miss-islington · scaramallion · web-flow · commit 1040299e9283 · 2020-10-18T18:33:28.000+03:00
(cherry picked from commit c304c9a) Co-authored-by: scaramallion <scaramallion@users.noreply.github.com>
diff --git a/Lib/datetime.py b/Lib/datetime.py
@@ -1545,7 +1545,7 @@ def __setstate(self, string, tzinfo):
         self._tzinfo = tzinfo
 
     def __reduce_ex__(self, protocol):
-        return (time, self._getstate(protocol))
+        return (self.__class__, self._getstate(protocol))
 
     def __reduce__(self):
         return self.__reduce_ex__(2)
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
@@ -1750,6 +1750,7 @@ def test_pickling_subclass_date(self):
             green = pickler.dumps(orig, proto)
             derived = unpickler.loads(green)
             self.assertEqual(orig, derived)
+            self.assertTrue(isinstance(derived, SubclassDate))
 
     def test_backdoor_resistance(self):
         # For fast unpickling, the constructor accepts a pickle byte string.
@@ -2277,6 +2278,7 @@ def test_pickling_subclass_datetime(self):
             green = pickler.dumps(orig, proto)
             derived = unpickler.loads(green)
             self.assertEqual(orig, derived)
+            self.assertTrue(isinstance(derived, SubclassDatetime))
 
     def test_compat_unpickle(self):
         tests = [
@@ -3326,6 +3328,7 @@ def test_pickling_subclass_time(self):
             green = pickler.dumps(orig, proto)
             derived = unpickler.loads(green)
             self.assertEqual(orig, derived)
+            self.assertTrue(isinstance(derived, SubclassTime))
 
     def test_compat_unpickle(self):
         tests = [
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -759,6 +759,7 @@ Meador Inge
 Peter Ingebretson
 Tony Ingraldi
 John Interrante
+Dean Inwood
 Bob Ippolito
 Roger Irwin
 Atsuo Ishimoto
diff --git a/Misc/NEWS.d/next/Library/2020-10-17-07-52-53.bpo-41966.gwEQRZ.rst b/Misc/NEWS.d/next/Library/2020-10-17-07-52-53.bpo-41966.gwEQRZ.rst
@@ -0,0 +1,2 @@
+Fix pickling pure Python :class:`datetime.time` subclasses. Patch by Dean
+Inwood.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix pickling pure Python :class:`datetime.time` subclasses. Patch by Dean
	`2`	`+Inwood.`