Nov 6, 2024 · Nov 6, 2024
diff --git a/Lib/pickle.py b/Lib/pickle.py
        self.framer.commit_frame()

        # Check for persistent id (defined by a subclass)
        pid = self.persistent_id(obj)
        if pid is not None and save_persistent_id:
            self.save_pers(pid)
            return
        if save_persistent_id:
            pid = self.persistent_id(obj)
            if pid is not None:
                self.save_pers(pid)
                return

        # Check the memo
        x = self.memo.get(id(obj))
diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
    def test_pickler_super(self):
        class PersPickler(self.pickler):
            def persistent_id(subself, obj):
                called.append(obj)
                self.assertIsNone(super().persistent_id(obj))
                return obj

        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
            f = io.BytesIO()
            pickler = PersPickler(f, proto)
            called = []
            pickler.dump('abc')
            self.assertEqual(called, ['abc'])
            self.assertEqual(self.loads(f.getvalue()), 'abc')

    def test_unpickler_super(self):
        class PersUnpickler(self.unpickler):
            def persistent_load(subself, pid):
                called.append(pid)
                with self.assertRaises(self.persistent_load_error):
                    super().persistent_load(pid)
                return pid

        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
            unpickler = PersUnpickler(io.BytesIO(self.dumps('abc', proto)))
            called = []
            self.assertEqual(unpickler.load(), 'abc')
            self.assertEqual(called, ['abc'])

 class PyPicklerUnpicklerObjectTests(AbstractPicklerUnpicklerObjectTests, unittest.TestCase):

diff --git a/Misc/NEWS.d/next/Library/2024-11-06-13-41-38.gh-issue-126489.toaf-0.rst b/Misc/NEWS.d/next/Library/2024-11-06-13-41-38.gh-issue-126489.toaf-0.rst
 The Python implementation of :mod:`pickle` no longer calls
 :meth:`pickle.Pickler.persistent_id` for the result of
 :meth:`!persistent_id`.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -533,10 +533,11 @@ def save(self, obj, save_persistent_id=True):
		self.framer.commit_frame()

		# Check for persistent id (defined by a subclass)
		pid = self.persistent_id(obj)
		if pid is not None and save_persistent_id:
		self.save_pers(pid)
		return
		if save_persistent_id:
		pid = self.persistent_id(obj)
		if pid is not None:
		self.save_pers(pid)
		return

		# Check the memo
		x = self.memo.get(id(obj))
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -224,25 +224,31 @@ def persistent_load(pid):
		def test_pickler_super(self):
		class PersPickler(self.pickler):
		def persistent_id(subself, obj):
		called.append(obj)
		self.assertIsNone(super().persistent_id(obj))
		return obj

		for proto in range(pickle.HIGHEST_PROTOCOL + 1):
		f = io.BytesIO()
		pickler = PersPickler(f, proto)
		called = []
		pickler.dump('abc')
		self.assertEqual(called, ['abc'])
		self.assertEqual(self.loads(f.getvalue()), 'abc')

		def test_unpickler_super(self):
		class PersUnpickler(self.unpickler):
		def persistent_load(subself, pid):
		called.append(pid)
		with self.assertRaises(self.persistent_load_error):
		super().persistent_load(pid)
		return pid

		for proto in range(pickle.HIGHEST_PROTOCOL + 1):
		unpickler = PersUnpickler(io.BytesIO(self.dumps('abc', proto)))
		called = []
		self.assertEqual(unpickler.load(), 'abc')
		self.assertEqual(called, ['abc'])

		class PyPicklerUnpicklerObjectTests(AbstractPicklerUnpicklerObjectTests, unittest.TestCase):

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		The Python implementation of :mod:`pickle` no longer calls
		:meth:`pickle.Pickler.persistent_id` for the result of
		:meth:`!persistent_id`.