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

bpo-30537: use PyNumber in itertools.islice instead of PyLong (#1918) 

* bpo-30537: use PyNumber in itertools instead of PyLong

* bpo-30537: revert changes except to islice_new

* bpo-30537: test itertools.islice and add entry to Misc/NEWS
This commit is contained in:
Will Roberts 2017-06-08 08:03:04 +02:00 committed by Raymond Hettinger
parent 5edf827c80
commit 0ecdc52514
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/test/test_itertools.py
View File

@ -1243,6 +1243,19 @@ class TestBasicOps(unittest.TestCase):
support.gc_collect()
self.assertIsNone(wr())
# Issue #30537: islice can accept integer-like objects as
# arguments
class IntLike(object):
def __init__(self, val):
self.val = val
def __index__(self):
return self.val
self.assertEqual(list(islice(range(100), IntLike(10))), list(range(10)))
self.assertEqual(list(islice(range(100), IntLike(10), IntLike(50))),
list(range(10, 50)))
self.assertEqual(list(islice(range(100), IntLike(10), IntLike(50), IntLike(5))),
list(range(10,50,5)))
def test_takewhile(self):
data = [1, 3, 5, 20, 2, 4, 6, 8]
self.assertEqual(list(takewhile(underten, data)), [1, 3, 5])

3
Misc/NEWS
View File

@ -128,6 +128,9 @@ Core and Builtins
- bpo-29546: Improve from-import error message with location
- bpo-30537: itertools.islice now accepts integer-like objects (having
an __index__ method) as start, stop, and slice arguments
- Issue #29319: Prevent RunMainFromImporter overwriting sys.path[0].
- Issue #29337: Fixed possible BytesWarning when compare the code objects.

8
Modules/itertoolsmodule.c
View File

@ -1417,7 +1417,7 @@ islice_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
numargs = PyTuple_Size(args);
if (numargs == 2) {
if (a1 != Py_None) {
stop = PyLong_AsSsize_t(a1);
stop = PyNumber_AsSsize_t(a1, PyExc_OverflowError);
if (stop == -1) {
if (PyErr_Occurred())
PyErr_Clear();
@ -1429,11 +1429,11 @@ islice_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
}
} else {
if (a1 != Py_None)
start = PyLong_AsSsize_t(a1);
start = PyNumber_AsSsize_t(a1, PyExc_OverflowError);
if (start == -1 && PyErr_Occurred())
PyErr_Clear();
if (a2 != Py_None) {
stop = PyLong_AsSsize_t(a2);
stop = PyNumber_AsSsize_t(a2, PyExc_OverflowError);
if (stop == -1) {
if (PyErr_Occurred())
PyErr_Clear();
@ -1453,7 +1453,7 @@ islice_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (a3 != NULL) {
if (a3 != Py_None)
step = PyLong_AsSsize_t(a3);
step = PyNumber_AsSsize_t(a3, PyExc_OverflowError);
if (step == -1 && PyErr_Occurred())
PyErr_Clear();
}