diff options
| author | Petri Lehtinen <petri@digip.org> | 2011-11-06 18:58:50 (GMT) |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2011-11-06 18:59:01 (GMT) |
| commit | 3b9d92aefef17ee528e4bfa0f7e87dc61e4a0da6 (patch) | |
| tree | e3d8544e030219796ed0a5ff685a6a3386365fd2 | |
| parent | 030aa35a1b5dc9a91b44abeda80d32df8a8d8952 (diff) | |
| download | cpython-3b9d92aefef17ee528e4bfa0f7e87dc61e4a0da6.zip cpython-3b9d92aefef17ee528e4bfa0f7e87dc61e4a0da6.tar.gz cpython-3b9d92aefef17ee528e4bfa0f7e87dc61e4a0da6.tar.bz2 | |
Revert "Accept None as start and stop parameters for list.index() and tuple.index()"
Issue #13340.
| -rw-r--r-- | Lib/test/list_tests.py | 7 | ||||
| -rw-r--r-- | Lib/test/seq_tests.py | 7 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/listobject.c | 14 | ||||
| -rw-r--r-- | Objects/tupleobject.c | 15 |
5 files changed, 7 insertions, 39 deletions
diff --git a/Lib/test/list_tests.py b/Lib/test/list_tests.py index 9528052..b8d6d6b 100644 --- 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 0c8cf90..f5e4e0e 100644 --- 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) @@ -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 10d9c00..f753643 100644 --- 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 1f2ab55..3249ccc 100644 --- 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) |