diff --git a/eventlet/hubs/hub.py b/eventlet/hubs/hub.py index 7dd9ee9..deb942d 100644 --- a/eventlet/hubs/hub.py +++ b/eventlet/hubs/hub.py @@ -219,9 +219,6 @@ class BaseHub(object): self.next_timers.append((scheduled_time, timer)) return scheduled_time - def timer_finished(self, timer): - pass - def timer_canceled(self, timer): self.timers_canceled += 1 len_timers = len(self.timers) @@ -229,7 +226,6 @@ class BaseHub(object): self.timers_canceled = 0 self.timers = [t for t in self.timers if not t[1].called] heapq.heapify(self.timers) - self.timer_finished(timer) def prepare_timers(self): heappush = heapq.heappush @@ -282,18 +278,15 @@ class BaseHub(object): heappop(t) try: - try: - if timer.called: - self.timers_canceled -= 1 - else: - timer() - except self.SYSTEM_EXCEPTIONS: - raise - except: - self.squelch_timer_exception(timer, sys.exc_info()) - clear_sys_exc_info() - finally: - self.timer_finished(timer) + if timer.called: + self.timers_canceled -= 1 + else: + timer() + except self.SYSTEM_EXCEPTIONS: + raise + except: + self.squelch_timer_exception(timer, sys.exc_info()) + clear_sys_exc_info() # for debugging: diff --git a/eventlet/hubs/timer.py b/eventlet/hubs/timer.py index 827d08e..53c4935 100644 --- a/eventlet/hubs/timer.py +++ b/eventlet/hubs/timer.py @@ -55,7 +55,6 @@ class Timer(object): try: cb(*args, **kw) finally: - get_hub().timer_finished(self) try: del self.tpl except AttributeError: @@ -96,10 +95,7 @@ class LocalTimer(Timer): if self.greenlet is not None and self.greenlet.dead: return cb, args, kw = self.tpl - try: - cb(*args, **kw) - finally: - get_hub().timer_finished(self) + cb(*args, **kw) def cancel(self): self.greenlet = None