diff options
| author | Raymond Hettinger <python@rcn.com> | 2014-06-25 04:39:27 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2014-06-25 04:39:27 (GMT) |
| commit | ee205dc7d834ce33e245b46cecc9e15ea73aaefb (patch) | |
| tree | c98f40eb7202c852c19f51a5fa7f169f597e6aa2 /Modules | |
| parent | 7232986239fe0a5de3cfaf671d9e94af18ba8d8c (diff) | |
| parent | 97d3555029b02fa4b432c1a1259b64aaa31e4e3e (diff) | |
| download | cpython-ee205dc7d834ce33e245b46cecc9e15ea73aaefb.zip cpython-ee205dc7d834ce33e245b46cecc9e15ea73aaefb.tar.gz cpython-ee205dc7d834ce33e245b46cecc9e15ea73aaefb.tar.bz2 | |
merge
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/itertoolsmodule.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index cec1f87..ae5b166 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -4109,14 +4109,17 @@ repeat_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { repeatobject *ro; PyObject *element; - Py_ssize_t cnt = -1; + Py_ssize_t cnt = -1, n_kwds = 0; static char *kwargs[] = {"object", "times", NULL}; if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|n:repeat", kwargs, &element, &cnt)) return NULL; - if (PyTuple_Size(args) == 2 && cnt < 0) + if (kwds != NULL) + n_kwds = PyDict_Size(kwds); + /* Does user supply times argument? */ + if ((PyTuple_Size(args) + n_kwds == 2) && cnt < 0) cnt = 0; ro = (repeatobject *)type->tp_alloc(type, 0); |