[Python-checkins] bpo-41966: Fix pickling pure datetime.time subclasses (GH-22731)
scaramallion
webhook-mailer at python.org
Sun Oct 18 10:49:57 EDT 2020
https://github.com/python/cpython/commit/c304c9a7efa8751b5bc7526fa95cd5f30aac2b92
commit: c304c9a7efa8751b5bc7526fa95cd5f30aac2b92
branch: master
author: scaramallion <scaramallion at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020-10-18T17:49:48+03:00
summary:
bpo-41966: Fix pickling pure datetime.time subclasses (GH-22731)
files:
A Misc/NEWS.d/next/Library/2020-10-17-07-52-53.bpo-41966.gwEQRZ.rst
M Lib/datetime.py
M Lib/test/datetimetester.py
M Misc/ACKS
diff --git a/Lib/datetime.py b/Lib/datetime.py
index ea86bcb8b2388..b896b94b0fe0e 100644
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -1548,7 +1548,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
index 8b61c26f9e5c2..775d3151ae290 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -1781,6 +1781,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.
@@ -2308,6 +2309,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 = [
@@ -3357,6 +3359,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
index 7f4a9bcbc0f8c..d81d0a255145c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -787,6 +787,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
new file mode 100644
index 0000000000000..0e7fad40077be
--- /dev/null
+++ 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.
More information about the Python-checkins
mailing list