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 ebf86c5..be054ea 100644
--- a/Lib/test/list_tests.py
+++ b/Lib/test/list_tests.py
@@ -365,13 +365,6 @@
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 824ae01..f655c29 100644
--- a/Lib/test/seq_tests.py
+++ b/Lib/test/seq_tests.py
@@ -361,13 +361,6 @@
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 199f9ff..2923982 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,9 +13,6 @@
- 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 5097956..00de597 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2109,20 +2109,12 @@
{
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 6f893d9..8aacd12 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -483,19 +483,12 @@
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)