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

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

Issue #13340.
This commit is contained in:
Petri Lehtinen 2011-11-06 21:05:41 +02:00
parent 864741b2c7 ebfaabd663
commit 9589ab1745
5 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/list_tests.py
View File

@ -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)

7
Lib/test/seq_tests.py
View File

@ -361,13 +361,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)

3
Misc/NEWS
View File

@ -16,9 +16,6 @@ Core and Builtins
- 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

14
Objects/listobject.c
View File

@ -2122,19 +2122,11 @@ listindex(PyListObject *self, PyObject *args)
{
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)

15
Objects/tupleobject.c
View File

@ -484,19 +484,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)