summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2007-02-28 18:27:41 (GMT)
committerRaymond Hettinger <python@rcn.com>2007-02-28 18:27:41 (GMT)
commit3035d2397f4a6d028d7b1f87563c649457d5cbb4 (patch)
treee1d14e168e6fc233c8123b1e7af2fa7abdf67f0c
parentf8267df2ad1c88dc3f1ee3c2a3fb1cc61a6a9f3d (diff)
downloadcpython-3035d2397f4a6d028d7b1f87563c649457d5cbb4.zip
cpython-3035d2397f4a6d028d7b1f87563c649457d5cbb4.tar.gz
cpython-3035d2397f4a6d028d7b1f87563c649457d5cbb4.tar.bz2
Docstring nit.
-rw-r--r--Lib/heapq.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/heapq.py b/Lib/heapq.py
index 0f67236..39e3800 100644
--- a/Lib/heapq.py
+++ b/Lib/heapq.py
@@ -311,7 +311,7 @@ except ImportError:
def merge(*iterables):
'''Merge multiple sorted inputs into a single sorted output.
- Similar to sorted(itertools.chain(*iterables)) but returns an iterable,
+ Similar to sorted(itertools.chain(*iterables)) but returns a generator,
does not pull the data into memory all at once, and assumes that each of
the input streams is already sorted (smallest to largest).