diff options
| author | Raymond Hettinger <python@rcn.com> | 2004-11-29 05:54:48 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2004-11-29 05:54:48 (GMT) |
| commit | e1defa4175426594be53c1bc6c3d2f02a0952bae (patch) | |
| tree | 31663cadc4ebc6d93bf0b7b8983bc4fa8bc19635 | |
| parent | f4c7c402d4944c3e1ff1a83925d5e11549ff4e36 (diff) | |
| download | cpython-e1defa4175426594be53c1bc6c3d2f02a0952bae.zip cpython-e1defa4175426594be53c1bc6c3d2f02a0952bae.tar.gz cpython-e1defa4175426594be53c1bc6c3d2f02a0952bae.tar.bz2 | |
Fix argument order in pure python version of nsmallest() and nlargest().
| -rw-r--r-- | Lib/heapq.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_heapq.py | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Lib/heapq.py b/Lib/heapq.py index 14a00dc..b4ebb91 100644 --- a/Lib/heapq.py +++ b/Lib/heapq.py @@ -175,7 +175,7 @@ def heapify(x): for i in reversed(xrange(n//2)): _siftup(x, i) -def nlargest(iterable, n): +def nlargest(n, iterable): """Find the n largest elements in a dataset. Equivalent to: sorted(iterable, reverse=True)[:n] @@ -195,7 +195,7 @@ def nlargest(iterable, n): result.sort(reverse=True) return result -def nsmallest(iterable, n): +def nsmallest(n, iterable): """Find the n smallest elements in a dataset. Equivalent to: sorted(iterable)[:n] diff --git a/Lib/test/test_heapq.py b/Lib/test/test_heapq.py index 7848e4e..68003e7 100644 --- a/Lib/test/test_heapq.py +++ b/Lib/test/test_heapq.py @@ -39,8 +39,11 @@ class TestHeap(unittest.TestCase): self.check_invariant(results) self.assertRaises(TypeError, heappush, []) - self.assertRaises(TypeError, heappush, None, None) - self.assertRaises(TypeError, heappop, None) + try: + self.assertRaises(TypeError, heappush, None, None) + self.assertRaises(TypeError, heappop, None) + except AttributeError: + pass def check_invariant(self, heap): # Check the heap invariant. |