summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-05-09 15:40:42 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-05-09 15:40:42 (GMT)
commit219a5dcc7864d58e78a45e5212064aa257d178a1 (patch)
tree240f1db54041fa9a35caa4779047655e4e1d2119 /Lib/test
parent867754e3e3c907f87d1bb0282df628deb392cd62 (diff)
parentf9756c2336029d082317718cd1b2e330f48164d6 (diff)
downloadcpython-219a5dcc7864d58e78a45e5212064aa257d178a1.zip
cpython-219a5dcc7864d58e78a45e5212064aa257d178a1.tar.gz
cpython-219a5dcc7864d58e78a45e5212064aa257d178a1.tar.bz2
Merge with 3.1.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_heapq.py20
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: