mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

bpo-35992: Use PySequence_GetItem only if sq_item is not NULL (GH-11857)

Browse source 
Not using `__class_getitem__()` fallback if there is a non-subcriptable metaclass was caused by a certain asymmetry between how `PySequenceMethods` and `PyMappingMethods` are used in `PyObject_GetItem`. This PR removes this asymmetry. No tests failed, so I assume it was not intentional.
This commit is contained in:
Ivan Levkivskyi 2019-02-17 23:13:46 +00:00 • committed by GitHub
parent 1bf8845f74
commit ac28147e78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Objects/abstract.c
View file

@ -143,6 +143,7 @@ PyObject *
PyObject_GetItem(PyObject *o, PyObject *key)
{
PyMappingMethods *m;
PySequenceMethods *ms;
if (o == NULL || key == NULL) {
return null_error();
@ -155,7 +156,8 @@ PyObject_GetItem(PyObject *o, PyObject *key)
return item;
}
if (o->ob_type->tp_as_sequence) {
ms = o->ob_type->tp_as_sequence;
if (ms && ms->sq_item) {
if (PyIndex_Check(key)) {
Py_ssize_t key_value;
key_value = PyNumber_AsSsize_t(key, PyExc_IndexError);
@ -163,9 +165,10 @@ PyObject_GetItem(PyObject *o, PyObject *key)
return NULL;
return PySequence_GetItem(o, key_value);
}
else if (o->ob_type->tp_as_sequence->sq_item)
else {
return type_error("sequence index must "
"be integer, not '%.200s'", key);
}
}
if (PyType_Check(o)) {