Merge in r68394 fixing itertools.permutations() and combinations().
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index 3a095b6..8125dcb 100644
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -1880,10 +1880,6 @@
PyErr_SetString(PyExc_ValueError, "r must be non-negative");
goto error;
}
- if (r > n) {
- PyErr_SetString(PyExc_ValueError, "r cannot be bigger than the iterable");
- goto error;
- }
indices = PyMem_Malloc(r * sizeof(Py_ssize_t));
if (indices == NULL) {
@@ -1903,7 +1899,7 @@
co->indices = indices;
co->result = NULL;
co->r = r;
- co->stopped = 0;
+ co->stopped = r > n ? 1 : 0;
return (PyObject *)co;
@@ -2143,10 +2139,6 @@
PyErr_SetString(PyExc_ValueError, "r must be non-negative");
goto error;
}
- if (r > n) {
- PyErr_SetString(PyExc_ValueError, "r cannot be bigger than the iterable");
- goto error;
- }
indices = PyMem_Malloc(n * sizeof(Py_ssize_t));
cycles = PyMem_Malloc(r * sizeof(Py_ssize_t));
@@ -2170,7 +2162,7 @@
po->cycles = cycles;
po->result = NULL;
po->r = r;
- po->stopped = 0;
+ po->stopped = r > n ? 1 : 0;
return (PyObject *)po;