From 3a9b062f5bb0f7d9c2a408c31509cdee4f6aa4c8 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 3 Jan 2009 22:07:57 +0000 Subject: Manually merge r68096,68189 from 3.0 branch. --- Lib/heapq.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'Lib/heapq.py') diff --git a/Lib/heapq.py b/Lib/heapq.py index 380fe1268b..2d3404644a 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 -- cgit v1.2.1