cpython: c33aa14f4edb (original) (raw)
Mercurial > cpython
changeset 73391:c33aa14f4edb
Accept None as start and stop parameters for list.index() and tuple.index(). Closes #13340. [#13340]
| Petri Lehtinen petri@digip.org | |
|---|---|
| date | Sat, 05 Nov 2011 23:23:17 +0200 |
| parents | 89c7ba01a3d2(current diff)5c1fcaf3cf1c(diff) |
| children | 992ba03d60a8 |
| files | Lib/test/list_tests.py Misc/NEWS Objects/listobject.c Objects/tupleobject.c |
| diffstat | 5 files changed, 40 insertions(+), 8 deletions(-)[+] [-] Lib/test/list_tests.py 7 Lib/test/seq_tests.py 7 Misc/NEWS 3 Objects/listobject.c 14 Objects/tupleobject.c 17 |
line wrap: on
line diff
--- 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)[](#l1.7)self.assertEqual(u.index(1, None, None), 4)[](#l1.8)self.assertEqual(u.index(1, 0, None), 4)[](#l1.9)self.assertEqual(u.index(1, None, 6), 4)[](#l1.10)self.assertRaises(ValueError, u.index, -1, 3)[](#l1.11)self.assertRaises(ValueError, u.index, -1, 3, None)[](#l1.12)self.assertRaises(ValueError, u.index, 1, None, 4)[](#l1.13)
self.assertRaises(TypeError, u.index)
--- 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)[](#l2.7)self.assertEqual(u.index(1, None, None), 4)[](#l2.8)self.assertEqual(u.index(1, 0, None), 4)[](#l2.9)self.assertEqual(u.index(1, None, 6), 4)[](#l2.10)self.assertRaises(ValueError, u.index, -1, 3)[](#l2.11)self.assertRaises(ValueError, u.index, -1, 3, None)[](#l2.12)self.assertRaises(ValueError, u.index, 1, None, 4)[](#l2.13)
self.assertRaises(TypeError, u.index)
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ What's New in Python 3.3 Alpha 1? Core and Builtins ----------------- +- Issue #13340: Accept None as start and stop parameters for
- Issue #9896: Add start, stop, and step attributes to range objects.
- Issue #13343: Fix a SystemError when a lambda expression uses a global
--- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2122,12 +2122,20 @@ listindex(PyListObject *self, PyObject * { Py_ssize_t i, start=0, stop=Py_SIZE(self); PyObject *v, *format_tuple, *err_string;
- if (!PyArg_ParseTuple(args, "O|O&O&:index", &v,
_PyEval_SliceIndex, &start,[](#l4.11)_PyEval_SliceIndex, &stop))[](#l4.12)
- if (start_obj != Py_None)
if (!_PyEval_SliceIndex(start_obj, &start))[](#l4.17)return NULL;[](#l4.18)
+ if (start < 0) { start += Py_SIZE(self); if (start < 0)
--- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -484,12 +484,19 @@ static PyObject * tupleindex(PyTupleObject *self, PyObject *args) { Py_ssize_t i, start=0, stop=Py_SIZE(self);
- if (!PyArg_ParseTuple(args, "O|O&O&:index", &v,
_PyEval_SliceIndex, &start,[](#l5.14)_PyEval_SliceIndex, &stop))[](#l5.15)return NULL;[](#l5.16)