mirror of
https://github.com/python/cpython
synced 2024-09-05 16:38:56 +00:00
gh-92114: Improve error message for types with __class_getitem__ = None (GH-92115)
This commit is contained in:
parent
ed711290a0
commit
4d10f703d7
|
@ -220,6 +220,7 @@ def __class_getitem__(cls):
|
|||
return None
|
||||
with self.assertRaises(TypeError):
|
||||
C_too_few[int]
|
||||
|
||||
class C_too_many:
|
||||
def __class_getitem__(cls, one, two):
|
||||
return None
|
||||
|
@ -232,16 +233,23 @@ def __class_getitem__(cls, item):
|
|||
return None
|
||||
with self.assertRaises(TypeError):
|
||||
C()[int]
|
||||
|
||||
class E: ...
|
||||
e = E()
|
||||
e.__class_getitem__ = lambda cls, item: 'This will not work'
|
||||
with self.assertRaises(TypeError):
|
||||
e[int]
|
||||
|
||||
class C_not_callable:
|
||||
__class_getitem__ = "Surprise!"
|
||||
with self.assertRaises(TypeError):
|
||||
C_not_callable[int]
|
||||
|
||||
class C_is_none(tuple):
|
||||
__class_getitem__ = None
|
||||
with self.assertRaisesRegex(TypeError, "C_is_none"):
|
||||
C_is_none[int]
|
||||
|
||||
def test_class_getitem_metaclass(self):
|
||||
class Meta(type):
|
||||
def __class_getitem__(cls, item):
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Improve error message when subscript a type with ``__class_getitem__`` set
|
||||
to ``None``.
|
|
@ -185,11 +185,12 @@ PyObject_GetItem(PyObject *o, PyObject *key)
|
|||
if (_PyObject_LookupAttr(o, &_Py_ID(__class_getitem__), &meth) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
if (meth) {
|
||||
if (meth && meth != Py_None) {
|
||||
result = PyObject_CallOneArg(meth, key);
|
||||
Py_DECREF(meth);
|
||||
return result;
|
||||
}
|
||||
Py_XDECREF(meth);
|
||||
PyErr_Format(PyExc_TypeError, "type '%.200s' is not subscriptable",
|
||||
((PyTypeObject *)o)->tp_name);
|
||||
return NULL;
|
||||
|
|
Loading…
Reference in a new issue