diff options
| author | Petri Lehtinen <petri@digip.org> | 2011-11-06 19:05:41 (GMT) |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2011-11-06 19:06:10 (GMT) |
| commit | 9589ab174577773c48492b4e2ad596d4b9c3b120 (patch) | |
| tree | 221d0ef407f5f86f2ab252d7e159ba5a661e1b9d /Objects | |
| parent | 864741b2c7aaabda736f917694a1d3b26700e8e3 (diff) | |
| parent | ebfaabd66373941e69a0b29589645857e0a6ccfc (diff) | |
| download | cpython-9589ab174577773c48492b4e2ad596d4b9c3b120.zip cpython-9589ab174577773c48492b4e2ad596d4b9c3b120.tar.gz cpython-9589ab174577773c48492b4e2ad596d4b9c3b120.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 cf4f276..69a632d 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2122,19 +2122,11 @@ listindex(PyListObject *self, PyObject *args) { Py_ssize_t i, start=0, stop=Py_SIZE(self); PyObject *v; - PyObject *start_obj = NULL, *stop_obj = 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 e311fcc..54a580d 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -484,19 +484,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) |