diff options
| author | Andrew Kuchling <amk@amk.ca> | 2013-06-22 23:27:59 (GMT) |
|---|---|---|
| committer | Andrew Kuchling <amk@amk.ca> | 2013-06-22 23:27:59 (GMT) |
| commit | 0e03d6f2e91ede8e66442086484e76afad1702c0 (patch) | |
| tree | 599b9952cc932726f4f81ec498cccb15c7dbca6d | |
| parent | b54b0ca02ab556392af315f8cff10fb477ba6928 (diff) | |
| parent | da30acf50b4ccf6751cdd6c786cbab283865a79f (diff) | |
| download | cpython-0e03d6f2e91ede8e66442086484e76afad1702c0.zip cpython-0e03d6f2e91ede8e66442086484e76afad1702c0.tar.gz cpython-0e03d6f2e91ede8e66442086484e76afad1702c0.tar.bz2 | |
Merge from 3.3
| -rw-r--r-- | Modules/itertoolsmodule.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 401c684..bd10ee4 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -1554,7 +1554,8 @@ static PyMethodDef islice_methods[] = { }; PyDoc_STRVAR(islice_doc, -"islice(iterable, [start,] stop [, step]) --> islice object\n\ +"islice(iterable, stop) --> islice object\n\ +islice(iterable, start, stop[, step]) --> islice object\n\ \n\ Return an iterator whose next() method returns selected values from an\n\ iterable. If start is specified, will skip all preceding elements;\n\ @@ -2229,7 +2230,7 @@ static PyMethodDef product_methods[] = { }; PyDoc_STRVAR(product_doc, -"product(*iterables) --> product object\n\ +"product(*iterables, repeat=1) --> product object\n\ \n\ Cartesian product of input iterables. Equivalent to nested for-loops.\n\n\ For example, product(A, B) returns the same as: ((x,y) for x in A for y in B).\n\ |