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

Issue #13340.

diff --git a/Lib/test/list_tests.py b/Lib/test/list_tests.py
index 9528052e31d3642840f9e84d380da894466ac4c8..b8d6d6bda6782617e1df66288cad0a331dc9a958 100644 (file)
--- a/Lib/test/list_tests.py
+++ b/Lib/test/list_tests.py
@@ -365,13 +365,6 @@ class CommonTest(seq_tests.CommonTest):
         self.assertEqual(u.index(0, 3), 3)
         self.assertEqual(u.index(0, 3, 4), 3)
         self.assertRaises(ValueError, u.index, 2, 0, -10)
-        self.assertEqual(u.index(1, None), 4)
-        self.assertEqual(u.index(1, None, None), 4)
-        self.assertEqual(u.index(1, 0, None), 4)
-        self.assertEqual(u.index(1, None, 6), 4)
-        self.assertRaises(ValueError, u.index, -1, 3)
-        self.assertRaises(ValueError, u.index, -1, 3, None)
-        self.assertRaises(ValueError, u.index, 1, None, 4)
 
         self.assertRaises(TypeError, u.index)
 

diff --git a/Lib/test/seq_tests.py b/Lib/test/seq_tests.py
index 0c8cf903a8664c0bc5be8658fb6dc860934eadf3..f5e4e0ef552d21a5eed5b361ac7e8befc1d919b1 100644 (file)
--- a/Lib/test/seq_tests.py
+++ b/Lib/test/seq_tests.py
@@ -363,13 +363,6 @@ class CommonTest(unittest.TestCase):
         self.assertEqual(u.index(0, 3), 3)
         self.assertEqual(u.index(0, 3, 4), 3)
         self.assertRaises(ValueError, u.index, 2, 0, -10)
-        self.assertEqual(u.index(1, None), 4)
-        self.assertEqual(u.index(1, None, None), 4)
-        self.assertEqual(u.index(1, 0, None), 4)
-        self.assertEqual(u.index(1, None, 6), 4)
-        self.assertRaises(ValueError, u.index, -1, 3)
-        self.assertRaises(ValueError, u.index, -1, 3, None)
-        self.assertRaises(ValueError, u.index, 1, None, 4)
 
         self.assertRaises(TypeError, u.index)
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 991136097377317860c08e8f671e4e197057a022..43e2763f6c36855d1b78c65fd128c03a3c592a92 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -11,9 +11,6 @@ Core and Builtins
 
 - Remove Py3k warning for callable.
 
-- Issue #13340: Accept None as start and stop parameters for
-  list.index() and tuple.index().
-
 - Issue #10519: Avoid unnecessary recursive function calls in
   setobject.c.
 

diff --git a/Objects/listobject.c b/Objects/listobject.c
index 10d9c009c1c9230d504343aa681ddf6b6fd79548..f753643bd39a94987be327c791dea4eed6183cae 100644 (file)
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2277,20 +2277,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)

diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 1f2ab552aeb9632086033bfa4348a22cb5bed13e..3249cccdb79b541c28a3834b92da209c0761a1d2 100644 (file)
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -510,19 +510,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)