Jul 29, 2024 · Jul 29, 2024 · Jul 29, 2024
diff --git a/Lib/pickle.py b/Lib/pickle.py
 # Tools used for pickling.

 def _getattribute(obj, name):
    top = obj
    for subpath in name.split('.'):
        if subpath == '<locals>':
            raise AttributeError("Can't get local attribute {!r} on {!r}"
                                 .format(name,obj))
                                 .format(name,top))
        try:
            parent = obj
            obj = getattr(obj, subpath)
        except AttributeError:
            raise AttributeError("Can't get attribute {!r} on {!r}"
                                 .format(name,obj)) from None
                                 .format(name,top)) from None
    return obj, parent

 def whichmodule(obj, name):
    if _HAVE_PICKLE_BUFFER:
        def save_picklebuffer(self, obj):
            if self.proto < 5:
                raise PicklingError("PickleBuffer can only pickled with "
                raise PicklingError("PickleBuffer can onlybepickled with "
                                    "protocol >= 5")
            with obj.raw() as m:
                if not m.contiguous:
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
        pb = pickle.PickleBuffer(b"foobar")
        for proto in range(0, 5):
            with self.subTest(proto=proto):
                with self.assertRaises(pickle.PickleError):
                with self.assertRaises(pickle.PickleError) as cm:
                    self.dumps(pb, proto)
                self.assertEqual(str(cm.exception),
                    'PickleBuffer can only be pickled with protocol >= 5')

    def test_non_continuous_buffer(self):
        if self.pickler is pickle._Pickler:
diff --git a/Misc/NEWS.d/next/Library/2024-07-29-10-24-48.gh-issue-122311.xChV1b.rst b/Misc/NEWS.d/next/Library/2024-07-29-10-24-48.gh-issue-122311.xChV1b.rst
 Fix some error messages in :mod:`pickle`.
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
        if (_PyUnicode_EqualToASCIIString(subpath, "<locals>")) {
            if (obj == NULL)
                PyErr_Format(PyExc_AttributeError,
                             "Can'tpickle local object %R", name);
                             "Can'tget local object %R", name);
            else
                PyErr_Format(PyExc_AttributeError,
                             "Can'tpickle local attribute %R on %R", name, obj);
                             "Can'tget local attribute %R on %R", name, obj);
            Py_DECREF(dotted_path);
            return NULL;
        }
 {
    if (self->proto < 5) {
        PyErr_SetString(st->PicklingError,
                        "PickleBuffer can only pickled with protocol >= 5");
                        "PickleBuffer can onlybepickled with protocol >= 5");
        return -1;
    }
    const Py_buffer* view = PyPickleBuffer_GetBuffer(obj);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -314,16 +314,17 @@ def load_frame(self, frame_size):
		# Tools used for pickling.

		def _getattribute(obj, name):
		top = obj
		for subpath in name.split('.'):
		if subpath == '<locals>':
		raise AttributeError("Can't get local attribute {!r} on {!r}"
		.format(name,obj))
		.format(name,top))
picnixz marked this conversation as resolved. Show resolvedHide resolved
		try:
		parent = obj
		obj = getattr(obj, subpath)
		except AttributeError:
		raise AttributeError("Can't get attribute {!r} on {!r}"
		.format(name,obj)) from None
		.format(name,top)) from None
		return obj, parent

		def whichmodule(obj, name):
Expand DownExpand Up		@@ -832,7 +833,7 @@ def save_bytearray(self, obj):
		if _HAVE_PICKLE_BUFFER:
		def save_picklebuffer(self, obj):
		if self.proto < 5:
		raise PicklingError("PickleBuffer can only pickled with "
		raise PicklingError("PickleBuffer can onlybepickled with "
		"protocol >= 5")
		with obj.raw() as m:
		if not m.contiguous:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1982,8 +1982,10 @@ def test_picklebuffer_error(self):
		pb = pickle.PickleBuffer(b"foobar")
		for proto in range(0, 5):
		with self.subTest(proto=proto):
		with self.assertRaises(pickle.PickleError):
		with self.assertRaises(pickle.PickleError) as cm:
		self.dumps(pb, proto)
		self.assertEqual(str(cm.exception),
		'PickleBuffer can only be pickled with protocol >= 5')
picnixz marked this conversation as resolved. Show resolvedHide resolved

		def test_non_continuous_buffer(self):
		if self.pickler is pickle._Pickler:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1817,10 +1817,10 @@ get_dotted_path(PyObject obj, PyObject name)
		if (_PyUnicode_EqualToASCIIString(subpath, "<locals>")) {
		if (obj == NULL)
		PyErr_Format(PyExc_AttributeError,
		"Can'tpickle local object %R", name);
		"Can'tget local object %R", name);
		else
		PyErr_Format(PyExc_AttributeError,
		"Can'tpickle local attribute %R on %R", name, obj);
		"Can'tget local attribute %R on %R", name, obj);
		Py_DECREF(dotted_path);
		return NULL;
		}
Expand DownExpand Up		@@ -2507,7 +2507,7 @@ save_picklebuffer(PickleState st, PicklerObject self, PyObject *obj)
		{
		if (self->proto < 5) {
		PyErr_SetString(st->PicklingError,
		"PickleBuffer can only pickled with protocol >= 5");
		"PickleBuffer can onlybepickled with protocol >= 5");
		return -1;
		}
		const Py_buffer* view = PyPickleBuffer_GetBuffer(obj);
Expand Down