diff options
| author | Georg Brandl <georg@python.org> | 2009-01-03 22:07:57 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-01-03 22:07:57 (GMT) |
| commit | 3a9b062f5bb0f7d9c2a408c31509cdee4f6aa4c8 (patch) | |
| tree | 1bc74abad9db6c9a36875d97c1229998ea26fa4f /Lib/heapq.py | |
| parent | 3f5f8228c02618480a2fd6bc8583621a94bacf2f (diff) | |
| download | cpython-3a9b062f5bb0f7d9c2a408c31509cdee4f6aa4c8.zip cpython-3a9b062f5bb0f7d9c2a408c31509cdee4f6aa4c8.tar.gz cpython-3a9b062f5bb0f7d9c2a408c31509cdee4f6aa4c8.tar.bz2 | |
Manually merge r68096,68189 from 3.0 branch.
Diffstat (limited to 'Lib/heapq.py')
| -rw-r--r-- | Lib/heapq.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Lib/heapq.py b/Lib/heapq.py index 380fe12..2d34046 100644 --- a/Lib/heapq.py +++ b/Lib/heapq.py @@ -354,9 +354,12 @@ def nsmallest(n, iterable, key=None): Equivalent to: sorted(iterable, key=key)[:n] """ + if key is None: + it = zip(iterable, count()) # decorate + result = _nsmallest(n, it) + return list(map(itemgetter(0), result)) # undecorate in1, in2 = tee(iterable) - keys = in1 if key is None else map(key, in1) - it = zip(keys, count(), in2) # decorate + it = zip(map(key, in1), count(), in2) # decorate result = _nsmallest(n, it) return list(map(itemgetter(2), result)) # undecorate @@ -366,9 +369,12 @@ def nlargest(n, iterable, key=None): Equivalent to: sorted(iterable, key=key, reverse=True)[:n] """ + if key is None: + it = zip(iterable, map(neg, count())) # decorate + result = _nlargest(n, it) + return list(map(itemgetter(0), result)) # undecorate in1, in2 = tee(iterable) - keys = in1 if key is None else map(key, in1) - it = zip(keys, map(neg, count()), in2) # decorate + it = zip(map(key, in1), map(neg, count()), in2) # decorate result = _nlargest(n, it) return list(map(itemgetter(2), result)) # undecorate |