heap fix

satella/coding/structures.py

@@ -184,20 +184,6 @@ class Heap(object):
         while heap:
             yield heapq.heappop(heap)
 
-    @returns_iterable
-    def pop_less_than(self, less):
-        """
-        Return all elements less (sharp inequality) than particular value.
-
-        This changes state of the heap
-        :param less: value to compare against
-        :return: Iterator
-        """
-        while self:
-            if self.heap[0] < less:
-                return
-            yield self.pop()
-
     @returns_iterable
     def iter_descending(self):
         """
@@ -254,16 +240,21 @@ class TimeBasedHeap(Heap):
         :param timestamp: timestamp for this item
         :param item: object
         """
-        self.push(timestamp, item)
+        self.push((timestamp, item))
 
-    def pop_less_than(self, timestamp):
+    @returns_iterable
+    def pop_less_than(self, less):
         """
-        Return a list of items with timestamps less than your value.
+        Return all elements less (sharp inequality) than particular value.
 
-        Items will be removed from heap
-        :return: list of tuple(timestamp::float, item)
+        This changes state of the heap
+        :param less: value to compare against
+        :return: Iterator
         """
-        return list(Heap.pop_less_than(self, timestamp))
+        while self:
+            if self.heap[0] < less:
+                return
+            yield self.pop()
 
     def remove(self, item):
         """

tests/test_coding/test_structures.py

@@ -23,6 +23,13 @@ class TestTimeBasedHeap(unittest.TestCase):
 
 class TestHeap(unittest.TestCase):
 
+    def test_push(self):
+        tbh = Heap()
+        tbh.push(10, 'A')
+        self.assertEquals((10, 'A'), tbh.pop())
+        tbh.push((10, 'A'))
+        self.assertEquals((10, 'A'), tbh.pop())
+
     def test_tbh_iter(self):
         tbh = Heap()