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

Use C heapreplace() instead of slower _siftup() in pure python.

This commit is contained in:
Raymond Hettinger 2007-02-19 06:59:32 +00:00
parent 54da9819cc
commit 45eb0f1419
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/heapq.py
View File

@ -319,7 +319,7 @@ def merge(*iterables):
[0, 1, 2, 3, 4, 5, 5, 7, 8, 10, 15, 20, 25]
'''
_heappop, siftup, _StopIteration = heappop, _siftup, StopIteration
_heappop, _heapreplace, _StopIteration = heappop, heapreplace, StopIteration
h = []
h_append = h.append
@ -337,7 +337,7 @@ def merge(*iterables):
v, itnum, next = s = h[0] # raises IndexError when h is empty
yield v
s[0] = next() # raises StopIteration when exhausted
siftup(h, 0) # restore heap condition
_heapreplace(h, s) # restore heap condition
except _StopIteration:
_heappop(h) # remove empty iterator
except IndexError: