Thanks to visit codestin.com
Credit goes to github.com

Skip to content

bpo-43857: Improve the AttributeError message when deleting a missing attribute #25424

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
merged 13 commits into from
May 5, 2022
Merged

bpo-43857: Improve the AttributeError message when deleting a missing attribute #25424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
014e47d
Fix the AttributeError message for deletion of a missing attribute
geryogam Apr 15, 2021
375bf08
Merge branch 'main' into patch-24
JelleZijlstra May 3, 2022
42da011
Remove duplicate test (see #25863)
geryogam May 4, 2022
e8a7b27
Add tests of error messages for attribute access
geryogam May 4, 2022
4b63ada
Create 2022-05-04-11-37-20.bpo-43857.WuX8p3.rst
geryogam May 4, 2022
ad05ba3
Restore a test incorrectly removed
geryogam May 4, 2022
935eea5
Update test_class.py
geryogam May 4, 2022
1cb97fc
Update dictobject.c
geryogam May 4, 2022
8dd6bb0
Update object.c
geryogam May 4, 2022
128d6e5
Update object.c
geryogam May 4, 2022
e8f2cc7
Update dictobject.c
geryogam May 4, 2022
4391f88
Update object.c
geryogam May 4, 2022
6f3ca32
Update object.c
geryogam May 5, 2022
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
43 changes: 43 additions & 0 deletions Lib/test/test_class.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,49 @@ class A:
with self.assertRaises(TypeError):
type.__setattr__(A, b'x', None)

def testTypeAttributeAccessErrorMessages(self):
class A:
pass

error_msg = "type object 'A' has no attribute 'x'"
with self.assertRaisesRegex(AttributeError, error_msg):
A.x
with self.assertRaisesRegex(AttributeError, error_msg):
del A.x

def testObjectAttributeAccessErrorMessages(self):
class A:
pass
class B:
y = 0
__slots__ = ('z',)

error_msg = "'A' object has no attribute 'x'"
with self.assertRaisesRegex(AttributeError, error_msg):
A().x
with self.assertRaisesRegex(AttributeError, error_msg):
del A().x

error_msg = "'B' object has no attribute 'x'"
with self.assertRaisesRegex(AttributeError, error_msg):
B().x
with self.assertRaisesRegex(AttributeError, error_msg):
del B().x
with self.assertRaisesRegex(AttributeError, error_msg):
B().x = 0

error_msg = "'B' object attribute 'y' is read-only"
with self.assertRaisesRegex(AttributeError, error_msg):
del B().y
with self.assertRaisesRegex(AttributeError, error_msg):
B().y = 0

error_msg = 'z'
with self.assertRaisesRegex(AttributeError, error_msg):
B().z
with self.assertRaisesRegex(AttributeError, error_msg):
del B().z

def testConstructorErrorMessages(self):
# bpo-31506: Improves the error message logic for object_new & object_init

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-05-04-11-37-20.bpo-43857.WuX8p3.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Improve the :exc:`AttributeError` message when deleting a missing attribute.
Patch by Géry Ogam.
4 changes: 3 additions & 1 deletion Objects/dictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5472,7 +5472,9 @@ _PyObject_StoreInstanceAttribute(PyObject *obj, PyDictValues *values,
values->values[ix] = value;
if (old_value == NULL) {
if (value == NULL) {
PyErr_SetObject(PyExc_AttributeError, name);
PyErr_Format(PyExc_AttributeError,
"'%.100s' object has no attribute '%U'",
Py_TYPE(obj)->tp_name, name);
return -1;
}
_PyDictValues_AddToInsertionOrder(values, ix);
Expand Down
18 changes: 14 additions & 4 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,7 +1382,7 @@ _PyObject_GenericSetAttrWithDict(PyObject *obj, PyObject *name,
return -1;

Py_INCREF(name);

Py_INCREF(tp);
descr = _PyType_Lookup(tp, name);

if (descr != NULL) {
Expand Down Expand Up @@ -1426,11 +1426,21 @@ _PyObject_GenericSetAttrWithDict(PyObject *obj, PyObject *name,
res = PyDict_SetItem(dict, name, value);
Py_DECREF(dict);
}
if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError))
PyErr_SetObject(PyExc_AttributeError, name);

if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError)) {
if (PyType_IsSubtype(tp, &PyType_Type)) {
PyErr_Format(PyExc_AttributeError,
"type object '%.50s' has no attribute '%U'",
((PyTypeObject*)obj)->tp_name, name);
}
else {
PyErr_Format(PyExc_AttributeError,
"'%.100s' object has no attribute '%U'",
tp->tp_name, name);
}
}
done:
Py_XDECREF(descr);
Py_DECREF(tp);
Py_DECREF(name);
return res;
}
Expand Down