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 ebf86c5fccb4c0dc3d2c15c34b6b66a264f3f416..be054eadf6e3551dbae709aac7255bb46f1e06cb 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 824ae0191f2602d91ee86f3ffde17faaf31e19be..f655c29eee2f6e8e2c148536118896178dd59ff3 100644 (file)
--- a/Lib/test/seq_tests.py
+++ b/Lib/test/seq_tests.py
@@ -361,13 +361,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 199f9ff3624bb45bc46d05b9d748e09e2094b676..2923982755a863ec4ed38e226553ca7a20f6ab8a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,9 +13,6 @@ Core and Builtins
 - Issue #13342: input() used to ignore sys.stdin's and sys.stdout's unicode
   error handler in interactive mode (when calling into PyOS_Readline()).
 
-- Issue #13340: Accept None as start and stop parameters for
-  list.index() and tuple.index().
-
 - Issue #13343: Fix a SystemError when a lambda expression uses a global
   variable in the default value of a keyword-only argument:
   (lambda *, arg=GLOBAL_NAME: None)

diff --git a/Objects/listobject.c b/Objects/listobject.c
index 509795657ad9f600f8e56ff633e693931ac39f12..00de597e5686221b25563cbf51d05be87a9bb22f 100644 (file)
--- 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)

diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 6f893d9c682ba50f167e5b825dbc01c6f4d089d7..8aacd121143fdcc4ed7557759a5b40ccd11500c1 100644 (file)
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -483,19 +483,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)