more type safety

satella/coding/structures.py

@@ -100,14 +100,16 @@ class TimeBasedHeap(object):
         """
         self.heap = []
 
+    @typed(None, (float, int), None)
     def put(self, timestamp, item):
         """
         Put an item of heap
-        :param timestamp: timestamp for this item - float
+        :param timestamp: timestamp for this item
         :param item: object
         """
         heapq.heappush(self.heap, (timestamp, item))
 
+    @typed(None, (float, int))
     def pop_less_than(self, timestamp):
         """
         Return a list of items with timestamps less than your value.

satella/coding/typecheck.py

@@ -267,7 +267,6 @@ def typed(*t_args, **t_kwargs):
             else:
                 cargs = args
 
-
             for argument, typedescr in zip(cargs, t_args):
                 if typedescr is not None:
                     if not isinstance(argument, typedescr):

satella/instrumentation/instrument.py

@@ -69,6 +69,7 @@ class Instrument(object):
 
         self.detail = detail
 
+    @typed(returns=InstrumentList)
     def get_children(self):
         """"
         Get all DIRECT descendenta of this instrument.
@@ -98,7 +99,7 @@ class Manager(Monitor):
     def __contains__(self, instrument):
         return instrument.name in self.instruments
 
-    @typed(object, six.string_types, six.string_types, int)
+    @typed(object, six.string_types, six.string_types, int, returns=Instrument)
     @Monitor.synchronized
     def getInstrument(self, name, description=u'', detail=RUNTIME):
         if name in self.instruments:
@@ -111,6 +112,6 @@ class Manager(Monitor):
 manager = Manager()
 
 
-@typed(six.string_types, six.string_types, int)
+@typed(six.string_types, six.string_types, int, returns=Instrument)
 def getInstrument(name, description=u'', detail=RUNTIME):
     return manager.getInstrument(name, description, detail)

satella/instrumentation/metrics.py

@@ -93,7 +93,6 @@ class CounterMetric(Metric):
         super(CounterMetric, self).__init__(*args, **kwargs)
         self.value = 0
         self.items = 0
-        self.sum = 0
 
     @typed(returns=tuple)
     def view(self):