summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2007-02-19 18:15:04 (GMT)
committerRaymond Hettinger <python@rcn.com>2007-02-19 18:15:04 (GMT)
commitcbac8ce5b0394fe68329ac839a07474969dd7493 (patch)
treec4cbfe4a1571febde06e9aeffe2bf00fd28e3f58
parent382abeff0f1a53ffaaddfea06e8721bf42b66502 (diff)
downloadcpython-cbac8ce5b0394fe68329ac839a07474969dd7493.zip
cpython-cbac8ce5b0394fe68329ac839a07474969dd7493.tar.gz
cpython-cbac8ce5b0394fe68329ac839a07474969dd7493.tar.bz2
Fixup docstrings for merge().
-rw-r--r--Doc/lib/libheapq.tex4
-rw-r--r--Lib/heapq.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/lib/libheapq.tex b/Doc/lib/libheapq.tex
index 32cc25e..e403a3a 100644
--- a/Doc/lib/libheapq.tex
+++ b/Doc/lib/libheapq.tex
@@ -96,8 +96,8 @@ timestamped entries from multiple log files). Returns an iterator over
over the sorted values.
Similar to \code{sorted(itertools.chain(*iterables))} but returns an iterable,
-does not pull the data into memory all at once, and reduces the number of
-comparisons by assuming that each of the input streams is already sorted.
+does not pull the data into memory all at once, and assumes that each of the
+input streams is already sorted (smallest to largest).
\versionadded{2.6}
\end{funcdesc}
diff --git a/Lib/heapq.py b/Lib/heapq.py
index 5d41425..0f67236 100644
--- a/Lib/heapq.py
+++ b/Lib/heapq.py
@@ -312,8 +312,8 @@ def merge(*iterables):
'''Merge multiple sorted inputs into a single sorted output.
Similar to sorted(itertools.chain(*iterables)) but returns an iterable,
- does not pull the data into memory all at once, and reduces the number
- of comparisons by assuming that each of the input streams is already sorted.
+ does not pull the data into memory all at once, and assumes that each of
+ the input streams is already sorted (smallest to largest).
>>> list(merge([1,3,5,7], [0,2,4,8], [5,10,15,20], [], [25]))
[0, 1, 2, 3, 4, 5, 5, 7, 8, 10, 15, 20, 25]