Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
scaramallion 2020-10-19 01:49:48 +11:00 committed by GitHub
parent a0c603cb9d
commit c304c9a7ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/datetime.py
View File

@ -1548,7 +1548,7 @@ class time:
self._tzinfo = tzinfo self._tzinfo = tzinfo
def __reduce_ex__(self, protocol): def __reduce_ex__(self, protocol):
return (time, self._getstate(protocol)) return (self.__class__, self._getstate(protocol))
def __reduce__(self): def __reduce__(self):
return self.__reduce_ex__(2) return self.__reduce_ex__(2)

3
Lib/test/datetimetester.py
View File

@ -1781,6 +1781,7 @@ class TestDate(HarmlessMixedComparison, unittest.TestCase):
green = pickler.dumps(orig, proto) green = pickler.dumps(orig, proto)
derived = unpickler.loads(green) derived = unpickler.loads(green)
self.assertEqual(orig, derived) self.assertEqual(orig, derived)
self.assertTrue(isinstance(derived, SubclassDate))
def test_backdoor_resistance(self): def test_backdoor_resistance(self):
# For fast unpickling, the constructor accepts a pickle byte string. # For fast unpickling, the constructor accepts a pickle byte string.
@ -2308,6 +2309,7 @@ class TestDateTime(TestDate):
green = pickler.dumps(orig, proto) green = pickler.dumps(orig, proto)
derived = unpickler.loads(green) derived = unpickler.loads(green)
self.assertEqual(orig, derived) self.assertEqual(orig, derived)
self.assertTrue(isinstance(derived, SubclassDatetime))
def test_compat_unpickle(self): def test_compat_unpickle(self):
tests = [ tests = [
@ -3357,6 +3359,7 @@ class TestTime(HarmlessMixedComparison, unittest.TestCase):
green = pickler.dumps(orig, proto) green = pickler.dumps(orig, proto)
derived = unpickler.loads(green) derived = unpickler.loads(green)
self.assertEqual(orig, derived) self.assertEqual(orig, derived)
self.assertTrue(isinstance(derived, SubclassTime))
def test_compat_unpickle(self): def test_compat_unpickle(self):
tests = [ tests = [

1
Misc/ACKS
View File

@ -787,6 +787,7 @@ Meador Inge
Peter Ingebretson Peter Ingebretson
Tony Ingraldi Tony Ingraldi
John Interrante John Interrante
Dean Inwood
Bob Ippolito Bob Ippolito
Roger Irwin Roger Irwin
Atsuo Ishimoto Atsuo Ishimoto

2
Misc/NEWS.d/next/Library/2020-10-17-07-52-53.bpo-41966.gwEQRZ.rst Normal file
View File

@ -0,0 +1,2 @@
Fix pickling pure Python :class:`datetime.time` subclasses. Patch by Dean
Inwood.