From f1cc6364dda4c089fe27a3a3fb11f93febb3a124 Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Tue, 25 May 2010 18:34:20 -0700 Subject: [PATCH] Importing twisted patch from favoyang. Fixes #55. --- AUTHORS | 3 ++- eventlet/twistedutil/join_reactor.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index da0538a..f9e8817 100644 --- a/AUTHORS +++ b/AUTHORS @@ -50,4 +50,5 @@ Thanks To * Slant, better iterator implementation in tpool * Ambroff, nice pygtk hub example * Michael Carter, and Marcin Bachry, nice repro of a bug and good diagnosis leading to the fix -* David Ziegler, reporting issue #53 \ No newline at end of file +* David Ziegler, reporting issue #53 +* Favo Yang, twisted hub patch \ No newline at end of file diff --git a/eventlet/twistedutil/join_reactor.py b/eventlet/twistedutil/join_reactor.py index 4e9ccc2..5964cbf 100644 --- a/eventlet/twistedutil/join_reactor.py +++ b/eventlet/twistedutil/join_reactor.py @@ -4,9 +4,8 @@ You generally don't have to use it unless you need to call reactor.run() yourself. """ from eventlet.hubs.twistedr import BaseTwistedHub -from eventlet import use_hub from eventlet.support import greenlets as greenlet -from eventlet.hubs import _threadlocal +from eventlet.hubs import _threadlocal, use_hub use_hub(BaseTwistedHub) assert not hasattr(_threadlocal, 'hub')