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.
diff --git a/Lib/test/test_heapq.py b/Lib/test/test_heapq.py
index fba4fd7..484ab48 100644
--- a/Lib/test/test_heapq.py
+++ b/Lib/test/test_heapq.py
@@ -198,7 +198,8 @@
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 @@
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)
#==============================================================================