Skip to content

gh-119494 Fix error messages for deleting/setting type attributes #119495

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 8 commits into from
Sep 18, 2025
Merged

gh-119494 Fix error messages for deleting/setting type attributes #119495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
af4f903
Fix error messages for deleting/setting type attributes
da-woods May 24, 2024
c183981
Appease linter
da-woods May 24, 2024
11ff423
📜🤖 Added by blurb_it.
blurb-it[bot] May 24, 2024
20668a6
Update test with new message
da-woods May 24, 2024
239d562
Merge branch 'main' into patch-2
iritkatriel Sep 18, 2025
f69e70b
try removing blank line
da-woods Sep 18, 2025
4e8ee58
Move news file
da-woods Sep 18, 2025
d0a3897
Update test_descr
da-woods Sep 18, 2025
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
4 changes: 2 additions & 2 deletions Lib/test/test_descr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4078,7 +4078,7 @@ class E(D):
self.assertEqual(C2.__subclasses__(), [D])

with self.assertRaisesRegex(TypeError,
"cannot delete '__bases__' attribute of immutable type"):
"cannot delete '__bases__' attribute of type 'D'"):
del D.__bases__
with self.assertRaisesRegex(TypeError, 'can only assign non-empty tuple'):
D.__bases__ = ()
Expand Down Expand Up @@ -5062,7 +5062,7 @@ class X:

with self.assertRaises(TypeError) as cm:
type(X).__dict__["__doc__"].__delete__(X)
self.assertIn("cannot delete '__doc__' attribute of immutable type 'X'", str(cm.exception))
self.assertIn("cannot delete '__doc__' attribute of type 'X'", str(cm.exception))
self.assertEqual(X.__doc__, "banana")

def test_qualname(self):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2024-05-24-07-02-47.gh-issue-119494.x3KUMC.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Exception text when trying to delete attributes of types was clarified.
8 changes: 4 additions & 4 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1465,15 +1465,15 @@ static PyMemberDef type_members[] = {
static int
check_set_special_type_attr(PyTypeObject *type, PyObject *value, const char *name)
{
if (_PyType_HasFeature(type, Py_TPFLAGS_IMMUTABLETYPE)) {
if (!value) {
PyErr_Format(PyExc_TypeError,
"cannot set '%s' attribute of immutable type '%s'",
"cannot delete '%s' attribute of type '%s'",
name, type->tp_name);
return 0;
}
if (!value) {
if (_PyType_HasFeature(type, Py_TPFLAGS_IMMUTABLETYPE)) {
PyErr_Format(PyExc_TypeError,
"cannot delete '%s' attribute of immutable type '%s'",
"cannot set '%s' attribute of immutable type '%s'",
name, type->tp_name);
return 0;
}
Expand Down
Loading