From 2ba198d2fbd8d4dd33d2c40af012d622eb03c18f Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Tue, 17 Jun 2008 21:25:35 +0000 Subject: Remove 2.6 compatibility code: now heapqueue items must implement the "<" operator. The compatibility code could not work: all 3.0 objects have a __lt__ method (which returns NotImplemented) Twisted will have to adapt its DelayedCall class. --- Lib/test/test_heapq.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Lib/test/test_heapq.py') diff --git a/Lib/test/test_heapq.py b/Lib/test/test_heapq.py index fba4fd71f85..484ab482887 100644 --- a/Lib/test/test_heapq.py +++ b/Lib/test/test_heapq.py @@ -198,7 +198,8 @@ class TestHeapC(TestHeap): module = c_heapq def test_comparison_operator(self): - # Issue 3501: Make sure heapq works with both __lt__ and __le__ + # Issue 3501: 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] self.module.heapify(data) @@ -215,9 +216,8 @@ class TestHeapC(TestHeap): return self.x >= other.x data = [random.random() for i in range(100)] target = sorted(data, reverse=True) - print("HASATTR", hasattr(LE(0), "__lt__"), LE(0).__lt__) self.assertEqual(hsort(data, LT), target) - self.assertEqual(hsort(data, LE), target) + self.assertRaises(TypeError, data, LE) #============================================================================== -- cgit v1.2.3