Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fixup docstrings for merge().

This commit is contained in:
Raymond Hettinger 2007-02-19 18:15:04 +00:00
parent 382abeff0f
commit cbac8ce5b0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/lib/libheapq.tex
View File

@ -96,8 +96,8 @@ timestamped entries from multiple log files). Returns an iterator over
over the sorted values. over the sorted values.
Similar to \code{sorted(itertools.chain(*iterables))} but returns an iterable, 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 does not pull the data into memory all at once, and assumes that each of the
comparisons by assuming that each of the input streams is already sorted. input streams is already sorted (smallest to largest).
\versionadded{2.6} \versionadded{2.6}
\end{funcdesc} \end{funcdesc}

4
Lib/heapq.py
View File

@ -312,8 +312,8 @@ def merge(*iterables):
'''Merge multiple sorted inputs into a single sorted output. '''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 an iterable,
does not pull the data into memory all at once, and reduces the number does not pull the data into memory all at once, and assumes that each of
of comparisons by assuming that each of the input streams is already sorted. the input streams is already sorted (smallest to largest).
>>> list(merge([1,3,5,7], [0,2,4,8], [5,10,15,20], [], [25])) >>> 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] [0, 1, 2, 3, 4, 5, 5, 7, 8, 10, 15, 20, 25]