Skip to content

gh-103333: Pickle the keyword attributes of AttributeError #103352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpshead merged 7 commits into from
May 12, 2023
Merged

gh-103333: Pickle the keyword attributes of AttributeError #103352

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e08ff2
Pickle the keyword attributes of AttributeError
csm10495 Apr 7, 2023
1102306
Only pickle names/args for AttributeError, don't do obj
csm10495 Apr 9, 2023
9873fcc
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 9, 2023
96d9886
ReSTify the NEWS entry.
gpshead May 10, 2023
0ee8b8c
Merge branch 'python:main' into attributeerror_pickling
csm10495 May 11, 2023
e08e217
PR feedback
csm10495 May 11, 2023
18598e2
Apply suggestions from code review
csm10495 May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PR feedback
  • Loading branch information
@csm10495
csm10495 committed May 11, 2023
commit e08e2175fac239a1ff8a4e701e31090ca2c669d1
3 changes: 1 addition & 2 deletions Lib/test/test_exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,8 +519,7 @@ def testAttributes(self):
try:
e = exc(*args, **kwargs)
except:
print("\nexc=%r, args=%r, kwargs=%r" %
(exc, args, kwargs), file=sys.stderr)
print(f"\nexc={exc!r}, args={args!r}", file=sys.stderr)
# raise
else:
# Verify module name
Expand Down
6 changes: 1 addition & 5 deletions Objects/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2292,7 +2292,7 @@ static PyObject *
AttributeError_getstate(PyAttributeErrorObject *self, PyObject *Py_UNUSED(ignored))
{
PyObject *dict = ((PyAttributeErrorObject *)self)->dict;
if (self->name || self->obj || self->args) {
if (self->name || self->args) {
dict = dict ? PyDict_Copy(dict) : PyDict_New();
if (dict == NULL)
return NULL;
Expand All @@ -2302,10 +2302,6 @@ AttributeError_getstate(PyAttributeErrorObject *self, PyObject *Py_UNUSED(ignore
}
/* We specifically are not pickling the obj attribute since there are many
cases where it is unlikely to be picklable. See GH-103352.
if (self->obj && PyDict_SetItemString(dict, "obj", self->obj) < 0) {
Py_DECREF(dict);
return NULL;
}
*/
if (self->args && PyDict_SetItemString(dict, "args", self->args) < 0) {
Py_DECREF(dict);
Expand Down