mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-13 15:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge with 3.2.

Browse source
This commit is contained in:
Ezio Melotti 2011-05-09 18:42:32 +03:00
commit 5fffaab1ad
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/test/test_heapq.py
View file

@ -191,17 +191,8 @@ class TestHeap(TestCase):
self.assertEqual(list(self.module.nlargest(n, data, key=f)), self.assertEqual(list(self.module.nlargest(n, data, key=f)),
sorted(data, key=f, reverse=True)[:n]) sorted(data, key=f, reverse=True)[:n])
class TestHeapPython(TestHeap):
module = py_heapq
@skipUnless(c_heapq, 'requires _heapq')
class TestHeapC(TestHeap):
module = c_heapq
def test_comparison_operator(self): def test_comparison_operator(self):
# Issue 3501: Make sure heapq works with both __lt__ # Issue 3051: Make sure heapq works with both __lt__
# For python 3.0, __le__ alone is not enough # For python 3.0, __le__ alone is not enough
def hsort(data, comp): def hsort(data, comp):
data = [comp(x) for x in data] data = [comp(x) for x in data]
@ -223,6 +214,15 @@ class TestHeapC(TestHeap):
self.assertRaises(TypeError, data, LE) self.assertRaises(TypeError, data, LE)
class TestHeapPython(TestHeap):
module = py_heapq
@skipUnless(c_heapq, 'requires _heapq')
class TestHeapC(TestHeap):
module = c_heapq
#============================================================================== #==============================================================================
class LenOnly: class LenOnly: