Skip to content

bpo-46730: Add more info to @property AttributeError messages #31311

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
sweeneyde merged 12 commits into from
Feb 16, 2022
Merged

bpo-46730: Add more info to @property AttributeError messages #31311

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
06df3a7
bpo-46730: Make @property AttributeError unique and sensible
Feb 13, 2022
0b1ac64
bpo-46730: Add more details on property origin to the AttributeError
Feb 13, 2022
e86f544
bpo-46730: Make AttributeError show self.__qualname__ instead of owne…
Feb 14, 2022
921d3e5
bpo-46730: Adjusted documentation according to the latest changes
Feb 14, 2022
f1cae0c
bpo-46730: Fix regex dot in tests
Feb 14, 2022
83cae88
bpo-46730: Make changes comply with PEP 7
Feb 14, 2022
7594277
bpo-46730: Change preposition from "in" to "of" in error
Feb 14, 2022
7399805
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 14, 2022
236e579
Update ACKS
Feb 14, 2022
1de53bb
bpo-46730: Remove "of type of" from the message
Feb 15, 2022
3d931a1
bpo-46730: Change the order of words
Feb 15, 2022
bc90175
bpo-46730: Fix doctest for property
Feb 16, 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
Prev Previous commit
Next Next commit
bpo-46730: Change preposition from "in" to "of" in error
  • Loading branch information
Alexander Lakeev
Alexander Lakeev committed Feb 14, 2022
commit 759427709ae8db023400aa9baafa6ec9c784ede3
4 changes: 2 additions & 2 deletions Lib/test/test_property.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,14 @@ def test_del_property(self):


class PropertyUnreachableAttributeWithName(_PropertyUnreachableAttribute, unittest.TestCase):
msg_format = r"^property 'foo' in object of type 'PropertyUnreachableAttributeWithName\.cls' {}$"
msg_format = r"^property 'foo' of object of type 'PropertyUnreachableAttributeWithName\.cls' {}$"

class cls:
foo = property()


class PropertyUnreachableAttributeNoName(_PropertyUnreachableAttribute, unittest.TestCase):
msg_format = "^property in object of type 'PropertyUnreachableAttributeNoName\.cls' {}$"
msg_format = "^property of object of type 'PropertyUnreachableAttributeNoName\.cls' {}$"

class cls:
pass
Expand Down
12 changes: 6 additions & 6 deletions Objects/descrobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1587,13 +1587,13 @@ property_descr_get(PyObject *self, PyObject *obj, PyObject *type)
if (gs->prop_get == NULL) {
if (gs->prop_name != NULL) {
PyErr_Format(PyExc_AttributeError,
"property %R in object of type %R has no getter",
"property %R of object of type %R has no getter",
gs->prop_name,
PyType_GetQualName(Py_TYPE(obj)));
}
else {
PyErr_Format(PyExc_AttributeError,
"property in object of type %R has no getter",
"property of object of type %R has no getter",
PyType_GetQualName(Py_TYPE(obj)));
}

Expand All @@ -1620,16 +1620,16 @@ property_descr_set(PyObject *self, PyObject *obj, PyObject *value)
if (gs->prop_name != NULL && obj != NULL) {
PyErr_Format(PyExc_AttributeError,
value == NULL ?
"property %R in object of type %R has no deleter" :
"property %R in object of type %R has no setter",
"property %R of object of type %R has no deleter" :
"property %R of object of type %R has no setter",
gs->prop_name,
PyType_GetQualName(Py_TYPE(obj)));
}
else if (obj != NULL) {
PyErr_Format(PyExc_AttributeError,
value == NULL ?
"property in object of type %R has no deleter" :
"property in object of type %R has no setter",
"property of object of type %R has no deleter" :
"property of object of type %R has no setter",
PyType_GetQualName(Py_TYPE(obj)));
}
else {
Expand Down