Skip to content

bpo-34169: Fix itertools.repeat to get the default when times is None. #8355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
corona10 wants to merge 1 commit into from
Closed

bpo-34169: Fix itertools.repeat to get the default when times is None. #8355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Lib/test/test_itertools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,6 +1130,11 @@ def test_repeat_with_negative_times(self):
self.assertEqual(repr(repeat('a', times=-1)), "repeat('a', 0)")
self.assertEqual(repr(repeat('a', times=-2)), "repeat('a', 0)")

def test_repeat_with_none_times(self):
self.assertEqual(repr(repeat('a')), "repeat('a')")
self.assertEqual(repr(repeat('a', None)), "repeat('a')")
self.assertEqual(repr(repeat('a', times=None)), "repeat('a')")

def test_map(self):
self.assertEqual(list(map(operator.pow, range(3), range(1,7))),
[0**1, 1**2, 2**3])
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2018-07-21-01-46-21.bpo-34169.Jl0Yex.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix itertools.repeat to get the default behavior when times is None.
26 changes: 18 additions & 8 deletions Modules/itertoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4192,18 +4192,28 @@ repeat_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
repeatobject *ro;
PyObject *element;
Py_ssize_t cnt = -1, n_kwds = 0;
PyObject *times = NULL;
Py_ssize_t cnt = -1;
static char *kwargs[] = {"object", "times", NULL};

if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|n:repeat", kwargs,
&element, &cnt))
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:repeat", kwargs,
&element, &times))
return NULL;

if (kwds != NULL)
n_kwds = PyDict_GET_SIZE(kwds);
/* Does user supply times argument? */
if ((PyTuple_Size(args) + n_kwds == 2) && cnt < 0)
cnt = 0;
if (times != NULL && times != Py_None) {
if (PyLong_CheckExact(times)) {
cnt = PyLong_AsSsize_t(times);
if (cnt == -1 && PyErr_Occurred()) {
return NULL;
}
if (cnt < 0) cnt = 0;
} else {
PyErr_Format(PyExc_TypeError,
"'times' requires an integer types not %.200s",
Py_TYPE(times)->tp_name);
return NULL;
}
}

ro = (repeatobject *)type->tp_alloc(type, 0);
if (ro == NULL)
Expand Down