Revert "Accept None as start and stop parameters for list.index() and tuple.index()"

Issue #13340.
This commit is contained in:
Petri Lehtinen 2011-11-06 21:05:41 +02:00
commit 9589ab1745
5 changed files with 7 additions and 39 deletions

View file

@ -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)