summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2005-08-21 11:58:06 (GMT)
committerRaymond Hettinger <python@rcn.com>2005-08-21 11:58:06 (GMT)
commit1823ae7e36c595e221cf21e10cb4380f0ce4ba69 (patch)
tree1652af7c0204797a78c29fd7615d72ddb9bdf446
parenta30616a88db1ccc481cd5c8e4b78652df5c0f8cf (diff)
downloadcpython-1823ae7e36c595e221cf21e10cb4380f0ce4ba69.zip
cpython-1823ae7e36c595e221cf21e10cb4380f0ce4ba69.tar.gz
cpython-1823ae7e36c595e221cf21e10cb4380f0ce4ba69.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 cf38c60..84b0ed5 100644
--- a/Doc/lib/libfuncs.tex
+++ b/Doc/lib/libfuncs.tex
@@ -1149,12 +1149,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.