Skip to content

heapq: Improve clarity (and small speed-up) by using tuple unpacking #3289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhettinger merged 2 commits into from
Sep 4, 2017
Merged

heapq: Improve clarity (and small speed-up) by using tuple unpacking #3289

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5237fa
Improve clarity (and small speed-up) by using tuple unpacking
rhettinger Sep 4, 2017
b359afa
Merge branch 'master' of github.com:python/cpython
rhettinger Sep 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Lib/heapq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,10 +498,10 @@ def nsmallest(n, iterable, key=None):
for elem in it:
if elem < top:
_heapreplace(result, (elem, order))
top = result[0][0]
top, _order = result[0]
order += 1
result.sort()
return [r[0] for r in result]
return [elem for (elem, order) in result]

# General case, slowest method
it = iter(iterable)
Expand All @@ -516,10 +516,10 @@ def nsmallest(n, iterable, key=None):
k = key(elem)
if k < top:
_heapreplace(result, (k, order, elem))
top = result[0][0]
top, _order, _elem = result[0]
order += 1
result.sort()
return [r[2] for r in result]
return [elem for (k, order, elem) in result]

def nlargest(n, iterable, key=None):
"""Find the n largest elements in a dataset.
Expand Down Expand Up @@ -559,10 +559,10 @@ def nlargest(n, iterable, key=None):
for elem in it:
if top < elem:
_heapreplace(result, (elem, order))
top = result[0][0]
top, _order = result[0]
order -= 1
result.sort(reverse=True)
return [r[0] for r in result]
return [elem for (elem, order) in result]

# General case, slowest method
it = iter(iterable)
Expand All @@ -577,10 +577,10 @@ def nlargest(n, iterable, key=None):
k = key(elem)
if top < k:
_heapreplace(result, (k, order, elem))
top = result[0][0]
top, _order, _elem = result[0]
order -= 1
result.sort(reverse=True)
return [r[2] for r in result]
return [elem for (k, order, elem) in result]

# If available, use C implementation
try:
Expand Down