diff options
| author | Petri Lehtinen <petri@digip.org> | 2011-11-05 21:20:57 (GMT) |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2011-11-05 21:24:31 (GMT) |
| commit | c2f0a46111dfc9958d1c0428f688b8f625888c88 (patch) | |
| tree | 982262d833eeaa814f91208372ea8b4d57a0c087 /Objects | |
| parent | 4e6bf41934de08f62b22b90cda2e331eb4641dea (diff) | |
| download | cpython-c2f0a46111dfc9958d1c0428f688b8f625888c88.zip cpython-c2f0a46111dfc9958d1c0428f688b8f625888c88.tar.gz cpython-c2f0a46111dfc9958d1c0428f688b8f625888c88.tar.bz2 | |
Accept None as start and stop parameters for list.index() and tuple.index()
Closes #13340.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/listobject.c | 14 | ||||
| -rw-r--r-- | Objects/tupleobject.c | 15 |
2 files changed, 22 insertions, 7 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c index 00de597..5097956 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2109,12 +2109,20 @@ listindex(PyListObject *self, PyObject *args) { Py_ssize_t i, start=0, stop=Py_SIZE(self); PyObject *v, *format_tuple, *err_string; + PyObject *start_obj = NULL, *stop_obj = NULL; static PyObject *err_format = NULL; - if (!PyArg_ParseTuple(args, "O|O&O&:index", &v, - _PyEval_SliceIndex, &start, - _PyEval_SliceIndex, &stop)) + if (!PyArg_ParseTuple(args, "O|OO:index", &v, &start_obj, &stop_obj)) return NULL; + + if (start_obj != Py_None) + if (!_PyEval_SliceIndex(start_obj, &start)) + return NULL; + + if (stop_obj != Py_None) + if (!_PyEval_SliceIndex(stop_obj, &stop)) + return NULL; + if (start < 0) { start += Py_SIZE(self); if (start < 0) diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index 8aacd12..6f893d9 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -483,12 +483,19 @@ static PyObject * tupleindex(PyTupleObject *self, PyObject *args) { Py_ssize_t i, start=0, stop=Py_SIZE(self); - PyObject *v; + PyObject *v, *start_obj = NULL, *stop_obj = NULL; - if (!PyArg_ParseTuple(args, "O|O&O&:index", &v, - _PyEval_SliceIndex, &start, - _PyEval_SliceIndex, &stop)) + if (!PyArg_ParseTuple(args, "O|OO:index", &v, &start_obj, &stop_obj)) return NULL; + + if (start_obj != Py_None) + if (!_PyEval_SliceIndex(start_obj, &start)) + return NULL; + + if (stop_obj != Py_None) + if (!_PyEval_SliceIndex(stop_obj, &stop)) + return NULL; + if (start < 0) { start += Py_SIZE(self); if (start < 0) |