Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge from 3.3

This commit is contained in:
Andrew Kuchling 2013-06-22 19:27:59 -04:00
parent b54b0ca02a da30acf50b
commit 0e03d6f2e9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/itertoolsmodule.c
View File

@ -1554,7 +1554,8 @@ static PyMethodDef islice_methods[] = {
}; };
PyDoc_STRVAR(islice_doc, 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\ \n\
Return an iterator whose next() method returns selected values from an\n\ Return an iterator whose next() method returns selected values from an\n\
iterable. If start is specified, will skip all preceding elements;\n\ iterable. If start is specified, will skip all preceding elements;\n\
@ -2229,7 +2230,7 @@ static PyMethodDef product_methods[] = {
}; };
PyDoc_STRVAR(product_doc, PyDoc_STRVAR(product_doc,
"product(*iterables) --> product object\n\ "product(*iterables, repeat=1) --> product object\n\
\n\ \n\
Cartesian product of input iterables. Equivalent to nested for-loops.\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\ For example, product(A, B) returns the same as: ((x,y) for x in A for y in B).\n\