[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/b6e625d7c19f
changeset:   69985:b6e625d7c19f
parent:      69981:25298224cb25
parent:      69984:ff82f912639c
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon May 09 18:42:32 2011 +0300
summary:
  Merge with 3.2.

files:
  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
--- a/Lib/test/test_heapq.py
+++ b/Lib/test/test_heapq.py
@@ -191,17 +191,8 @@
                 self.assertEqual(list(self.module.nlargest(n, data, key=f)),
                                  sorted(data, key=f, reverse=True)[:n])
 
-
-class TestHeapPython(TestHeap):
-    module = py_heapq
-
-
- at 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 @@
         self.assertRaises(TypeError, data, LE)
 
 
+class TestHeapPython(TestHeap):
+    module = py_heapq
+
+
+ at skipUnless(c_heapq, 'requires _heapq')
+class TestHeapC(TestHeap):
+    module = c_heapq
+
+
 #==============================================================================
 
 class LenOnly:

-- 
Repository URL: http://hg.python.org/cpython