Mercurial > cpython-lru_cache-weakref

diff Objects/tupleobject.c @ 73407:19ffa12ffdd4 2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Issue #13340.
author Petri Lehtinen <petri@digip.org>
date Sun, 06 Nov 2011 20:58:50 +0200
parents 0f0eda4daac7
children bb0390c1d3d4
line wrap: on
line diff
--- a/Objects/tupleobject.c	Sun Nov 06 18:50:32 2011 +0200
+++ b/Objects/tupleobject.c	Sun Nov 06 20:58:50 2011 +0200
@@ -510,19 +510,12 @@
 tupleindex(PyTupleObject *self, PyObject *args)
 {
     Py_ssize_t i, start=0, stop=Py_SIZE(self);
-    PyObject *v, *start_obj = NULL, *stop_obj = NULL;
-
-    if (!PyArg_ParseTuple(args, "O|OO:index", &v, &start_obj, &stop_obj))
-        return NULL;
+    PyObject *v;
 
-    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 (!PyArg_ParseTuple(args, "O|O&O&:index", &v,
+                                _PyEval_SliceIndex, &start,
+                                _PyEval_SliceIndex, &stop))
+        return NULL;
     if (start < 0) {
         start += Py_SIZE(self);
         if (start < 0)