Merge pull request dpkp#312 from dpkp/reentrant_timer_py26

dpkp · dpkp · commit fa41ec6da70a · 2015-02-03T12:33:58.000-08:00
Fix python2.6 threading.Event bug in ReentrantTimer
diff --git a/kafka/util.py b/kafka/util.py
@@ -126,7 +126,11 @@ def __init__(self, t, fn, *args, **kwargs):
         self.active = None
 
     def _timer(self, active):
-        while not active.wait(self.t):
+        # python2.6 Event.wait() always returns None
+        # python2.7 and greater returns the flag value (true/false)
+        # we want the flag value, so add an 'or' here for python2.6
+        # this is redundant for later python versions (FLAG OR FLAG == FLAG)
+        while not (active.wait(self.t) or active.is_set()):
             self.fn(*self.args, **self.kwargs)
 
     def start(self):
