summaryrefslogtreecommitdiffstats
path: root/Objects/listobject.c
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2011-11-06 19:02:39 (GMT)
committerPetri Lehtinen <petri@digip.org>2011-11-06 19:02:39 (GMT)
commitebfaabd66373941e69a0b29589645857e0a6ccfc (patch)
treea2cf14c2acf5c2fcc5a6363fdf1e874762c62ee0 /Objects/listobject.c
parentfd6b582a7128434ae7a5fb0e4c202cc04348ade7 (diff)
downloadcpython-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/listobject.c')
-rw-r--r--Objects/listobject.c14
1 files changed, 3 insertions, 11 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)