diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-05-09 15:42:32 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-05-09 15:42:32 (GMT) |
| commit | 5fffaab1ad588337011a5db141f6347d9e3c916d (patch) | |
| tree | f2e74f0f8074bfee13ebda42df21673914e10056 /Lib/test | |
| parent | c7ae19b6a7cf819d5646f2c88c5dd6e2c244939d (diff) | |
| parent | 219a5dcc7864d58e78a45e5212064aa257d178a1 (diff) | |
| download | cpython-5fffaab1ad588337011a5db141f6347d9e3c916d.zip cpython-5fffaab1ad588337011a5db141f6347d9e3c916d.tar.gz cpython-5fffaab1ad588337011a5db141f6347d9e3c916d.tar.bz2 | |
Merge with 3.2.
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_heapq.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Lib/test/test_heapq.py b/Lib/test/test_heapq.py index f19d56e..e0c49c1 100644 --- a/Lib/test/test_heapq.py +++ b/Lib/test/test_heapq.py @@ -191,17 +191,8 @@ class TestHeap(TestCase): self.assertEqual(list(self.module.nlargest(n, data, key=f)), 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): - # 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 def hsort(data, comp): data = [comp(x) for x in data] @@ -223,6 +214,15 @@ class TestHeapC(TestHeap): self.assertRaises(TypeError, data, LE) +class TestHeapPython(TestHeap): + module = py_heapq + + +@skipUnless(c_heapq, 'requires _heapq') +class TestHeapC(TestHeap): + module = c_heapq + + #============================================================================== class LenOnly: |