diff options
| author | Petri Lehtinen <petri@digip.org> | 2011-11-06 19:02:39 (GMT) |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2011-11-06 19:02:39 (GMT) |
| commit | ebfaabd66373941e69a0b29589645857e0a6ccfc (patch) | |
| tree | a2cf14c2acf5c2fcc5a6363fdf1e874762c62ee0 /Objects | |
| parent | fd6b582a7128434ae7a5fb0e4c202cc04348ade7 (diff) | |
| download | cpython-ebfaabd66373941e69a0b29589645857e0a6ccfc.zip cpython-ebfaabd66373941e69a0b29589645857e0a6ccfc.tar.gz cpython-ebfaabd66373941e69a0b29589645857e0a6ccfc.tar.bz2 | |
Revert "Accept None as start and stop parameters for list.index() and tuple.index()"
Issue #13340.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/listobject.c | 14 | ||||
| -rw-r--r-- | Objects/tupleobject.c | 15 |
2 files changed, 7 insertions, 22 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c index 5097956..00de597 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2109,20 +2109,12 @@ 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|OO:index", &v, &start_obj, &stop_obj)) + if (!PyArg_ParseTuple(args, "O|O&O&:index", &v, + _PyEval_SliceIndex, &start, + _PyEval_SliceIndex, &stop)) 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 6f893d9..8aacd12 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -483,19 +483,12 @@ static PyObject * tupleindex(PyTupleObject *self, PyObject *args) { Py_ssize_t i, start=0, stop=Py_SIZE(self); - PyObject *v, *start_obj = NULL, *stop_obj = NULL; + PyObject *v; - if (!PyArg_ParseTuple(args, "O|OO:index", &v, &start_obj, &stop_obj)) + if (!PyArg_ParseTuple(args, "O|O&O&:index", &v, + _PyEval_SliceIndex, &start, + _PyEval_SliceIndex, &stop)) 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) |