Skip to content

bpo-46927: Include the type's name in the error message for subscripting non-generic types #31694

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
serhiy-storchaka merged 2 commits into from
Mar 5, 2022
Merged

bpo-46927: Include the type's name in the error message for subscripting non-generic types #31694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd1c1f2
bpo-46927: Include the type's name in the error message for subscribi…
serhiy-storchaka Mar 5, 2022
79f9eb9
Update Misc/NEWS.d/next/Core and Builtins/2022-03-05-12-23-58.bpo-469…
serhiy-storchaka Mar 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
2 changes: 1 addition & 1 deletion Lib/test/test_exception_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def test_exception_group_types(self):
self.assertTrue(issubclass(BaseExceptionGroup, BaseException))

def test_exception_is_not_generic_type(self):
with self.assertRaises(TypeError):
with self.assertRaisesRegex(TypeError, 'Exception'):
Exception[OSError]

def test_exception_group_is_generic_type(self):
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_genericalias.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def test_unsubscriptable(self):
for t in int, str, float, Sized, Hashable:
tname = t.__name__
with self.subTest(f"Testing {tname}"):
with self.assertRaises(TypeError):
with self.assertRaisesRegex(TypeError, tname):
t[int]

def test_instantiate(self):
Expand Down Expand Up @@ -275,7 +275,7 @@ def test_type_generic(self):
def test_type_subclass_generic(self):
class MyType(type):
pass
with self.assertRaises(TypeError):
with self.assertRaisesRegex(TypeError, 'MyType'):
MyType[int]

def test_pickle(self):
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-03-05-12-23-58.bpo-46927.URbHBi.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Include the type's name in the error message for subscripting non-generic
types.
3 changes: 3 additions & 0 deletions Objects/abstract.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@ PyObject_GetItem(PyObject *o, PyObject *key)
Py_DECREF(meth);
return result;
}
PyErr_Format(PyExc_TypeError, "type '%.200s' is not subscriptable",
((PyTypeObject *)o)->tp_name);
return NULL;
}

return type_error("'%.200s' object is not subscriptable", o);
Expand Down