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.
This commit is contained in:
Amaury Forgeot d'Arc 2008-06-17 21:25:35 +00:00
parent 35c8658a74
commit 2ba198d2fb
2 changed files with 4 additions and 22 deletions

View file

@ -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)
#==============================================================================