summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2005-08-21 11:59:04 (GMT)
committerRaymond Hettinger <python@rcn.com>2005-08-21 11:59:04 (GMT)
commite72393978f254ccf5e51ae8de6b99dc3568f124d (patch)
tree51e4c796296341211297ea67c00dd13a14b1b9f4
parentd4a439c2f964b539d7b8e1f3fd3b811586e34077 (diff)
downloadcpython-e72393978f254ccf5e51ae8de6b99dc3568f124d.zip
cpython-e72393978f254ccf5e51ae8de6b99dc3568f124d.tar.gz
cpython-e72393978f254ccf5e51ae8de6b99dc3568f124d.tar.bz2
SF bug #1121416: zip incorrectly and incompletely documented
sequences ==> iterables
-rw-r--r--Doc/lib/libfuncs.tex8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/lib/libfuncs.tex b/Doc/lib/libfuncs.tex
index c0595b1..77ee972 100644
--- a/Doc/lib/libfuncs.tex
+++ b/Doc/lib/libfuncs.tex
@@ -1111,12 +1111,12 @@ It's a function
that the number of elements fit in a native C long.}
\end{funcdesc}
-\begin{funcdesc}{zip}{\optional{seq1, \moreargs}}
+\begin{funcdesc}{zip}{\optional{iterable, \moreargs}}
This function returns a list of tuples, where the \var{i}-th tuple contains
- the \var{i}-th element from each of the argument sequences.
+ the \var{i}-th element from each of the argument sequences or iterables.
The returned list is truncated in length to the length of
- the shortest argument sequence. When there are multiple argument
- sequences which are all of the same length, \function{zip()} is
+ the shortest argument sequence. When there are multiple arguments
+ which are all of the same length, \function{zip()} is
similar to \function{map()} with an initial argument of \code{None}.
With a single sequence argument, it returns a list of 1-tuples.
With no arguments, it returns an empty list.