Improve clarity (and small speed-up) by using tuple unpacking (#3289)
diff --git a/Lib/heapq.py b/Lib/heapq.py
index 0b3e89a..b31f418 100644
--- a/Lib/heapq.py
+++ b/Lib/heapq.py
@@ -498,10 +498,10 @@
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)
@@ -516,10 +516,10 @@
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.
@@ -559,10 +559,10 @@
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)
@@ -577,10 +577,10 @@
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: