(original) (raw)

changeset: 73409:106f9e1ad7ab parent: 73403:386a319b1825 parent: 73408:ed0e85efac47 user: Petri Lehtinen petri@digip.org date: Sun Nov 06 21:05:41 2011 +0200 files: Lib/test/list_tests.py Misc/NEWS Objects/listobject.c Objects/tupleobject.c description: Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Issue #13340. diff -r 386a319b1825 -r 106f9e1ad7ab Lib/test/list_tests.py --- a/Lib/test/list_tests.py Sun Nov 06 15:10:48 2011 +0100 +++ b/Lib/test/list_tests.py Sun Nov 06 21:05:41 2011 +0200 @@ -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 -r 386a319b1825 -r 106f9e1ad7ab Lib/test/seq_tests.py --- a/Lib/test/seq_tests.py Sun Nov 06 15:10:48 2011 +0100 +++ b/Lib/test/seq_tests.py Sun Nov 06 21:05:41 2011 +0200 @@ -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 -r 386a319b1825 -r 106f9e1ad7ab Misc/NEWS --- a/Misc/NEWS Sun Nov 06 15:10:48 2011 +0100 +++ b/Misc/NEWS Sun Nov 06 21:05:41 2011 +0200 @@ -16,9 +16,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 #9896: Add start, stop, and step attributes to range objects. - Issue #13343: Fix a SystemError when a lambda expression uses a global diff -r 386a319b1825 -r 106f9e1ad7ab Objects/listobject.c --- a/Objects/listobject.c Sun Nov 06 15:10:48 2011 +0100 +++ b/Objects/listobject.c Sun Nov 06 21:05:41 2011 +0200 @@ -2122,19 +2122,11 @@ { Py_ssize_t i, start=0, stop=Py_SIZE(self); PyObject *v; - PyObject *start_obj = NULL, *stop_obj = 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 -r 386a319b1825 -r 106f9e1ad7ab Objects/tupleobject.c --- a/Objects/tupleobject.c Sun Nov 06 15:10:48 2011 +0100 +++ b/Objects/tupleobject.c Sun Nov 06 21:05:41 2011 +0200 @@ -484,19 +484,12 @@ tupleindex(PyTupleObject *self, PyObject *args) { Py_ssize_t i, start=0, stop=Py_SIZE(self); - PyObject *v, *start_obj = NULL, *stop_obj = NULL; - - if (!PyArg_ParseTuple(args, "O|OO:index", &v, &start_obj, &stop_obj)) - return NULL; + PyObject *v; - 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 (!PyArg_ParseTuple(args, "O|O&O&:index", &v, + _PyEval_SliceIndex, &start, + _PyEval_SliceIndex, &stop)) + return NULL; if (start < 0) { start += Py_SIZE(self); if (start < 0) /petri@digip.org