summaryrefslogtreecommitdiff
path: root/Objects/tupleobject.c
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2011-11-06 21:05:41 +0200
committerPetri Lehtinen <petri@digip.org>2011-11-06 21:06:10 +0200
commit9589ab174577773c48492b4e2ad596d4b9c3b120 (patch)
tree221d0ef407f5f86f2ab252d7e159ba5a661e1b9d /Objects/tupleobject.c
parent864741b2c7aaabda736f917694a1d3b26700e8e3 (diff)
parentebfaabd66373941e69a0b29589645857e0a6ccfc (diff)
downloadcpython-git-9589ab174577773c48492b4e2ad596d4b9c3b120.tar.gz
Revert "Accept None as start and stop parameters for list.index() and tuple.index()"
Issue #13340.
Diffstat (limited to 'Objects/tupleobject.c')
-rw-r--r--Objects/tupleobject.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index e311fcca5d..54a580d4a3 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)