(original) (raw)

changeset: 73391:c33aa14f4edb parent: 73388:89c7ba01a3d2 parent: 73390:5c1fcaf3cf1c user: Petri Lehtinen petri@digip.org date: Sat Nov 05 23:23:17 2011 +0200 files: Lib/test/list_tests.py Misc/NEWS Objects/listobject.c Objects/tupleobject.c description: Accept None as start and stop parameters for list.index() and tuple.index(). Closes #13340. diff -r 89c7ba01a3d2 -r c33aa14f4edb Lib/test/list_tests.py --- a/Lib/test/list_tests.py Sat Nov 05 13:43:01 2011 -0700 +++ b/Lib/test/list_tests.py Sat Nov 05 23:23:17 2011 +0200 @@ -365,6 +365,13 @@ 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 -r 89c7ba01a3d2 -r c33aa14f4edb Lib/test/seq_tests.py --- a/Lib/test/seq_tests.py Sat Nov 05 13:43:01 2011 -0700 +++ b/Lib/test/seq_tests.py Sat Nov 05 23:23:17 2011 +0200 @@ -361,6 +361,13 @@ 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 -r 89c7ba01a3d2 -r c33aa14f4edb Misc/NEWS --- a/Misc/NEWS Sat Nov 05 13:43:01 2011 -0700 +++ b/Misc/NEWS Sat Nov 05 23:23:17 2011 +0200 @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #13340: Accept None as start and stop parameters for + list.index() and tuple.index(). + - Issue #9896: Add start, stop, and step attributes to range objects. - Issue #13343: Fix a SystemError when a lambda expression uses a global diff -r 89c7ba01a3d2 -r c33aa14f4edb Objects/listobject.c --- a/Objects/listobject.c Sat Nov 05 13:43:01 2011 -0700 +++ b/Objects/listobject.c Sat Nov 05 23:23:17 2011 +0200 @@ -2122,12 +2122,20 @@ { 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|O&O&:index", &v, - _PyEval_SliceIndex, &start, - _PyEval_SliceIndex, &stop)) + if (!PyArg_ParseTuple(args, "O|OO:index", &v, &start_obj, &stop_obj)) 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 -r 89c7ba01a3d2 -r c33aa14f4edb Objects/tupleobject.c --- a/Objects/tupleobject.c Sat Nov 05 13:43:01 2011 -0700 +++ b/Objects/tupleobject.c Sat Nov 05 23:23:17 2011 +0200 @@ -484,12 +484,19 @@ tupleindex(PyTupleObject *self, PyObject *args) { Py_ssize_t i, start=0, stop=Py_SIZE(self); - PyObject *v; + PyObject *v, *start_obj = NULL, *stop_obj = NULL; + + if (!PyArg_ParseTuple(args, "O|OO:index", &v, &start_obj, &stop_obj)) + return NULL; - 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) /petri@digip.org