diff options
author | Raymond Hettinger <python@rcn.com> | 2009-01-08 06:39:04 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2009-01-08 06:39:04 (GMT) |
commit | 5b913e31a1cbcea7807fca4cc272079039a3bd67 (patch) | |
tree | 1f4780e5b0da6e946bfc5698d1f592b0fc96dab7 /Modules/itertoolsmodule.c | |
parent | 1a67f589c623316d581b45440aa03928a7814c0d (diff) | |
download | cpython-5b913e31a1cbcea7807fca4cc272079039a3bd67.zip cpython-5b913e31a1cbcea7807fca4cc272079039a3bd67.tar.gz cpython-5b913e31a1cbcea7807fca4cc272079039a3bd67.tar.bz2 |
Forward port r68394 for issue 4816.
Diffstat (limited to 'Modules/itertoolsmodule.c')
-rw-r--r-- | Modules/itertoolsmodule.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 18a1229..5875d10 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -2059,10 +2059,6 @@ combinations_new(PyTypeObject *type, PyObject *args, PyObject *kwds) 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) { @@ -2082,7 +2078,7 @@ combinations_new(PyTypeObject *type, PyObject *args, PyObject *kwds) co->indices = indices; co->result = NULL; co->r = r; - co->stopped = 0; + co->stopped = r > n ? 1 : 0; return (PyObject *)co; @@ -2318,10 +2314,6 @@ permutations_new(PyTypeObject *type, PyObject *args, PyObject *kwds) 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)); @@ -2345,7 +2337,7 @@ permutations_new(PyTypeObject *type, PyObject *args, PyObject *kwds) po->cycles = cycles; po->result = NULL; po->r = r; - po->stopped = 0; + po->stopped = r > n ? 1 : 0; return (PyObject *)po; |