Merge from 3.3

This commit is contained in:
Andrew Kuchling 2013-06-21 08:07:35 -04:00
commit 3468d25a80
2 changed files with 2 additions and 2 deletions

View File

@ -278,7 +278,7 @@ loops that truncate the stream.
.. function:: count(start=0, step=1)
Make an iterator that returns evenly spaced values starting with *n*. Often
Make an iterator that returns evenly spaced values starting with number *start*. Often
used as an argument to :func:`map` to generate consecutive data points.
Also, used with :func:`zip` to add sequence numbers. Equivalent to::

View File

@ -4452,7 +4452,7 @@ PyDoc_STRVAR(module_doc,
"Functional tools for creating and using iterators.\n\
\n\
Infinite iterators:\n\
count([n]) --> n, n+1, n+2, ...\n\
count(start=0, step=1) --> start, start+step, start+2*step, ...\n\
cycle(p) --> p0, p1, ... plast, p0, p1, ...\n\
repeat(elem [,n]) --> elem, elem, elem, ... endlessly or up to n times\n\
\n\