cpython: 19ffa12ffdd4 (original) (raw)
Mercurial > cpython
changeset 73407:19ffa12ffdd4 2.7
Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Issue #13340. [#13340]
| Petri Lehtinen petri@digip.org | |
|---|---|
| date | Sun, 06 Nov 2011 20:58:50 +0200 |
| parents | a6d70861bf6d |
| children | 0b779988e8b7 |
| files | Lib/test/list_tests.py Lib/test/seq_tests.py Misc/NEWS Objects/listobject.c Objects/tupleobject.c |
| diffstat | 5 files changed, 8 insertions(+), 40 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,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)[](#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 @@ -363,13 +363,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)[](#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 @@ -11,9 +11,6 @@ Core and Builtins
- Remove Py3k warning for callable. -- Issue #13340: Accept None as start and stop parameters for
- list.index() and tuple.index(). -
- Issue #10519: Avoid unnecessary recursive function calls in setobject.c.
--- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2277,20 +2277,12 @@ listindex(PyListObject *self, PyObject * { 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|OO:index", &v, &start_obj, &stop_obj))
- if (!PyArg_ParseTuple(args, "O|O&O&:index", &v,
_PyEval_SliceIndex, &start,[](#l4.12)_PyEval_SliceIndex, &stop))[](#l4.13) return NULL;[](#l4.14)
- 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 @@ -510,19 +510,12 @@ static PyObject * tupleindex(PyTupleObject *self, PyObject *args) { Py_ssize_t i, start=0, stop=Py_SIZE(self);