From b031ffa855fbd525506ad4504f35b4cac076b7d7 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sun, 6 Nov 2011 21:02:39 +0200 Subject: Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Issue #13340. --- Objects/listobject.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'Objects/listobject.c') diff --git a/Objects/listobject.c b/Objects/listobject.c index 509795657a..00de597e56 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) -- cgit v1.2.1