summaryrefslogtreecommitdiffstats
path: root/Doc/library/functions.rst
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2011-10-30 22:07:01 (GMT)
committerRaymond Hettinger <python@rcn.com>2011-10-30 22:07:01 (GMT)
commit5d12faa5b873bc85778b5a68b340eed659fa3519 (patch)
treefe114a53edcbb15ce5691648ca77243b97312a04 /Doc/library/functions.rst
parent385c803658e7603f0b416de0d06a9fc967e58051 (diff)
parent6f45d18c2474097a36bec5a769f30d33cd1b12be (diff)
downloadcpython-5d12faa5b873bc85778b5a68b340eed659fa3519.zip
cpython-5d12faa5b873bc85778b5a68b340eed659fa3519.tar.gz
cpython-5d12faa5b873bc85778b5a68b340eed659fa3519.tar.bz2
Merge
Diffstat (limited to 'Doc/library/functions.rst')
-rw-r--r--Doc/library/functions.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 1ff6b2a..f63cea4 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1375,10 +1375,10 @@ are always available. They are listed here in alphabetical order.
def zip(*iterables):
# zip('ABCD', 'xy') --> Ax By
sentinel = object()
- iterables = [iter(it) for it in iterables]
- while iterables:
+ iterators = [iter(it) for it in iterables]
+ while iterators:
result = []
- for it in iterables:
+ for it in iterators:
elem = next(it, sentinel)
if elem is sentinel:
return