From 09e812f0c2803d17ff41e040ae2754c2bf4062b2 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Fri, 16 Oct 2020 07:59:01 +1100 Subject: [PATCH 1/3] Fix pickling pure datetime.time subclasses --- Lib/datetime.py | 2 +- Lib/test/datetimetester.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/datetime.py b/Lib/datetime.py index ea86bcb8b2388a..b896b94b0fe0e4 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 8b61c26f9e5c24..775d3151ae2902 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 = [ From 87cf0915df95ee2579c7588457ddb2bf2e336304 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sat, 17 Oct 2020 07:54:45 +1100 Subject: [PATCH 2/3] Add NEWS entry --- .../NEWS.d/next/Library/2020-10-17-07-52-53.bpo-41966.gwEQRZ.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Library/2020-10-17-07-52-53.bpo-41966.gwEQRZ.rst 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 00000000000000..ba38bdb2c8a0a5 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-10-17-07-52-53.bpo-41966.gwEQRZ.rst @@ -0,0 +1 @@ +Fix pickling pure Python :class:`datetime.time` subclasses From bf09d50022ab1bef8bc85556555d717c715733e8 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sun, 18 Oct 2020 21:47:57 +1100 Subject: [PATCH 3/3] Add name to ACK, update news item --- Misc/ACKS | 1 + .../next/Library/2020-10-17-07-52-53.bpo-41966.gwEQRZ.rst | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Misc/ACKS b/Misc/ACKS index 7f4a9bcbc0f8cd..d81d0a255145cb 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 index ba38bdb2c8a0a5..0e7fad40077be0 100644 --- 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 @@ -1 +1,2 @@ -Fix pickling pure Python :class:`datetime.time` subclasses +Fix pickling pure Python :class:`datetime.time` subclasses. Patch by Dean +Inwood.