summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Kuchling <amk@amk.ca>2013-06-21 12:07:35 (GMT)
committerAndrew Kuchling <amk@amk.ca>2013-06-21 12:07:35 (GMT)
commit3468d25a80b6d080b2a90d596ba4c3f6c2618d39 (patch)
tree15676b1328670cd87883f4c39f64bd29c1a60375
parent5e03e49c94f0ad14c3e0bc6329b03d91eff52b1b (diff)
parentedb4260ffdda734ec028d56f4eb2006890c35f4c (diff)
downloadcpython-3468d25a80b6d080b2a90d596ba4c3f6c2618d39.zip
cpython-3468d25a80b6d080b2a90d596ba4c3f6c2618d39.tar.gz
cpython-3468d25a80b6d080b2a90d596ba4c3f6c2618d39.tar.bz2
Merge from 3.3
-rw-r--r--Doc/library/itertools.rst2
-rw-r--r--Modules/itertoolsmodule.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
index a0745d7..0ee93ed 100644
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -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::
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index 644104e..401c684 100644
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -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\