From c2f0a46111dfc9958d1c0428f688b8f625888c88 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sat, 5 Nov 2011 23:20:57 +0200 Subject: [PATCH] Accept None as start and stop parameters for list.index() and tuple.index() Closes #13340. --- Lib/test/list_tests.py | 7 +++++++ Lib/test/seq_tests.py | 7 +++++++ Misc/NEWS | 3 +++ Objects/listobject.c | 14 +++++++++++--- Objects/tupleobject.c | 15 +++++++++++---- 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/Lib/test/list_tests.py b/Lib/test/list_tests.py index be054eadf6e..ebf86c5fccb 100644 --- a/Lib/test/list_tests.py +++ b/Lib/test/list_tests.py @@ -365,6 +365,13 @@ 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 f655c29eee2..824ae0191f2 100644 --- a/Lib/test/seq_tests.py +++ b/Lib/test/seq_tests.py @@ -361,6 +361,13 @@ 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 de3d3f32cae..720fef3f7c5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ What's New in Python 3.2.3? Core and Builtins ----------------- +- 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 00de597e568..509795657ad 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2109,12 +2109,20 @@ 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|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 --git a/Objects/tupleobject.c b/Objects/tupleobject.c index 8aacd121143..6f893d9c682 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -483,12 +483,19 @@ static PyObject * 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|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)