Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Accept None as start and stop parameters for list.index() and tuple.index() 

Closes #13340.
This commit is contained in:
Petri Lehtinen 2011-11-05 23:18:06 +02:00
parent 972ba9e41f
commit 819d8d447d
5 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/list_tests.py
View File

@ -365,6 +365,13 @@ class CommonTest(seq_tests.CommonTest):
self.assertEqual(u.index(0, 3), 3) self.assertEqual(u.index(0, 3), 3)
self.assertEqual(u.index(0, 3, 4), 3) self.assertEqual(u.index(0, 3, 4), 3)
self.assertRaises(ValueError, u.index, 2, 0, -10) 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) self.assertRaises(TypeError, u.index)

7
Lib/test/seq_tests.py
View File

@ -363,6 +363,13 @@ class CommonTest(unittest.TestCase):
self.assertEqual(u.index(0, 3), 3) self.assertEqual(u.index(0, 3), 3)
self.assertEqual(u.index(0, 3, 4), 3) self.assertEqual(u.index(0, 3, 4), 3)
self.assertRaises(ValueError, u.index, 2, 0, -10) 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) self.assertRaises(TypeError, u.index)

3
Misc/NEWS
View File

@ -9,6 +9,9 @@ What's New in Python 2.7.3?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #13340: Accept None as start and stop parameters for
list.index() and tuple.index().
- Issue #10519: Avoid unnecessary recursive function calls in - Issue #10519: Avoid unnecessary recursive function calls in
setobject.c. setobject.c.

14
Objects/listobject.c
View File

@ -2277,12 +2277,20 @@ listindex(PyListObject *self, PyObject *args)
{ {
Py_ssize_t i, start=0, stop=Py_SIZE(self); Py_ssize_t i, start=0, stop=Py_SIZE(self);
PyObject *v, *format_tuple, *err_string; PyObject *v, *format_tuple, *err_string;
PyObject *start_obj = NULL, *stop_obj = NULL;
static PyObject *err_format = NULL; static PyObject *err_format = NULL;
if (!PyArg_ParseTuple(args, "O|O&O&:index", &v, if (!PyArg_ParseTuple(args, "O|OO:index", &v, &start_obj, &stop_obj))
_PyEval_SliceIndex, &start,
_PyEval_SliceIndex, &stop))
return NULL; 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) { if (start < 0) {
start += Py_SIZE(self); start += Py_SIZE(self);
if (start < 0) if (start < 0)

15
Objects/tupleobject.c
View File

@ -510,12 +510,19 @@ static PyObject *
tupleindex(PyTupleObject *self, PyObject *args) tupleindex(PyTupleObject *self, PyObject *args)
{ {
Py_ssize_t i, start=0, stop=Py_SIZE(self); 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, if (!PyArg_ParseTuple(args, "O|OO:index", &v, &start_obj, &stop_obj))
_PyEval_SliceIndex, &start,
_PyEval_SliceIndex, &stop))
return NULL; 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) { if (start < 0) {
start += Py_SIZE(self); start += Py_SIZE(self);
if (start < 0) if (start < 0)