mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Fixed _pickle.Unpickler to handle empty persistent IDs correctly.
This commit is contained in:
parent
1a83070d9e
commit
896414fedf
3 changed files with 26 additions and 19 deletions
|
@ -1499,30 +1499,34 @@ class AbstractPersistentPicklerTests(unittest.TestCase):
|
|||
if isinstance(object, int) and object % 2 == 0:
|
||||
self.id_count += 1
|
||||
return str(object)
|
||||
elif object == "test_false_value":
|
||||
self.false_count += 1
|
||||
return ""
|
||||
else:
|
||||
return None
|
||||
|
||||
def persistent_load(self, oid):
|
||||
self.load_count += 1
|
||||
object = int(oid)
|
||||
assert object % 2 == 0
|
||||
return object
|
||||
if not oid:
|
||||
self.load_false_count += 1
|
||||
return "test_false_value"
|
||||
else:
|
||||
self.load_count += 1
|
||||
object = int(oid)
|
||||
assert object % 2 == 0
|
||||
return object
|
||||
|
||||
def test_persistence(self):
|
||||
self.id_count = 0
|
||||
self.load_count = 0
|
||||
L = list(range(10))
|
||||
self.assertEqual(self.loads(self.dumps(L)), L)
|
||||
self.assertEqual(self.id_count, 5)
|
||||
self.assertEqual(self.load_count, 5)
|
||||
|
||||
def test_bin_persistence(self):
|
||||
self.id_count = 0
|
||||
self.load_count = 0
|
||||
L = list(range(10))
|
||||
self.assertEqual(self.loads(self.dumps(L, 1)), L)
|
||||
self.assertEqual(self.id_count, 5)
|
||||
self.assertEqual(self.load_count, 5)
|
||||
L = list(range(10)) + ["test_false_value"]
|
||||
for proto in protocols:
|
||||
self.id_count = 0
|
||||
self.false_count = 0
|
||||
self.load_false_count = 0
|
||||
self.load_count = 0
|
||||
self.assertEqual(self.loads(self.dumps(L, proto)), L)
|
||||
self.assertEqual(self.id_count, 5)
|
||||
self.assertEqual(self.false_count, 1)
|
||||
self.assertEqual(self.load_count, 5)
|
||||
self.assertEqual(self.load_false_count, 1)
|
||||
|
||||
|
||||
class AbstractPicklerUnpicklerObjectTests(unittest.TestCase):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue