cleanup code

1 files changed, 7 insertions, 5 deletions

diff --git a/aiogreen.py b/aiogreen.py
index 511e010..c298e10 100644
--- a/aiogreen.py
+++ b/aiogreen.py
@@ -266,7 +266,6 @@ class _GeventSelector(_Selector):
 
 class _EventLoop(asyncio.SelectorEventLoop):
     def __init__(self, selector):
-        self._greenthread = None
         super(_EventLoop, self).__init__(selector=selector)
 
     def call_soon(self, callback, *args):
@@ -294,12 +293,14 @@ class _EventLoop(asyncio.SelectorEventLoop):
 
 class EventletEventLoop(_EventLoop):
     def __init__(self):
+        self._greenthread = None
+
         # Store a reference to the hub to ensure
         # that we always use the same hub
         self._hub = eventlet.hubs.get_hub()
 
         selector = _EventletSelector(self._hub, self)
-        super(EventletEventLoop, self).__init__(hub, selector)
+        super(EventletEventLoop, self).__init__(selector=selector)
 
         # Force a call to set_debug() to set hub.debug_blocking
         self.set_debug(self.get_debug())
@@ -419,6 +420,7 @@ class EventletEventLoop(_EventLoop):
 # FIXME: support gevent 1.0
 class GeventEventLoop(_EventLoop):
     def __init__(self):
+        self._greenlet = None
         selector = _GeventSelector(self)
         super(GeventEventLoop, self).__init__(selector=selector)
 
@@ -430,7 +432,7 @@ class GeventEventLoop(_EventLoop):
         The function must not be called from the greenthread
         of the aiogreen event loop.
         """
-        if self._greenthread == gevent.getcurrent():
+        if self._greenlet == gevent.getcurrent():
             raise RuntimeError("link_future() must not be called from "
                                "the greenthread of the aiogreen event loop")
 
@@ -497,11 +499,11 @@ class GeventEventLoop(_EventLoop):
         return fut
 
     def run_forever(self):
-        self._greenthread = gevent.getcurrent()
+        self._greenlet = gevent.getcurrent()
         try:
             super(_EventLoop, self).run_forever()
         finally:
-            self._greenthread = None
+            self._greenlet = None
 
 
 class EventletEventLoopPolicy(asyncio.DefaultEventLoopPolicy):