diff options
Diffstat (limited to 'Objects/stringobject.c')
| -rw-r--r-- | Objects/stringobject.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 91f0103..bbbeaa6 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -1184,14 +1184,11 @@ string_hash(PyStringObject *a) return x; } -#define HASINDEX(o) PyType_HasFeature((o)->ob_type, Py_TPFLAGS_HAVE_INDEX) - static PyObject* string_subscript(PyStringObject* self, PyObject* item) { - PyNumberMethods *nb = item->ob_type->tp_as_number; - if (nb != NULL && HASINDEX(item) && nb->nb_index != NULL) { - Py_ssize_t i = nb->nb_index(item); + if (PyIndex_Check(item)) { + Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError); if (i == -1 && PyErr_Occurred()) return NULL; if (i < 0) |