bring branch up-to-date

py25/bacpypes/bvllservice.py

@@ -542,7 +542,7 @@ class BIPForeign(BIPSAP, Client, Server, OneShotTask, DebugContents):
         self.bbmdTimeToLive = ttl
 
         # install this task to run when it gets a chance
-        self.install_task(delta=0)
+        self.install_task(when=0)
 
     def unregister(self):
         """Drop the registration with a BBMD."""

py25/bacpypes/core.py

@@ -144,6 +144,9 @@ def run(spin=SPIN, sigterm=stop, sigusr1=print_stack):
                 time.sleep(sleeptime)
                 delta -= sleeptime
 
+            # delta should be no more than the spin value
+            delta = min(delta, spin)
+
             # if there are deferred functions, use a small delta
             if deferredFns:
                 delta = min(delta, 0.001)