mirror of https://github.com/python/cpython
Fixup docstrings for merge().
This commit is contained in:
parent
382abeff0f
commit
cbac8ce5b0
|
@ -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}
|
||||
|
||||
|
|
|
@ -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]
|
||||
|
|
Loading…
Reference in New Issue