From 25bc37d9ebb946f793f8f898c3e13af8a9240b1f Mon Sep 17 00:00:00 2001
From: Ryan Williams <breath@alum.mit.edu>
Date: Sat, 2 Oct 2010 18:00:36 -0700
Subject: [PATCH] Fix for unusual kill() error that was probably introduced by
 a bugfix in greenlet.

---
 eventlet/greenthread.py | 7 ++++---
 eventlet/hubs/hub.py    | 5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/eventlet/greenthread.py b/eventlet/greenthread.py
index 92f298f..6e99b60 100644
--- a/eventlet/greenthread.py
+++ b/eventlet/greenthread.py
@@ -23,7 +23,7 @@ def sleep(seconds=0):
     occasionally; otherwise nothing else will run.
     """
     hub = hubs.get_hub()
-    current = greenlet.getcurrent()
+    current = getcurrent()
     assert hub.greenlet is not current, 'do not call blocking functions from the mainloop'
     timer = hub.schedule_call_global(seconds, current.switch)
     try:
@@ -255,7 +255,8 @@ def kill(g, *throw_args):
                 g.main(just_raise, (), {})
             except:
                 pass
-    if getcurrent() is not hub.greenlet:
+    current = getcurrent()
+    if current is not hub.greenlet:
         # arrange to wake the caller back up immediately
-        hub.schedule_call_global(0,getcurrent().switch)
+        hub.schedule_call_global(0, current.switch)
     g.throw(*throw_args)
diff --git a/eventlet/hubs/hub.py b/eventlet/hubs/hub.py
index e1442dc..af7bd89 100644
--- a/eventlet/hubs/hub.py
+++ b/eventlet/hubs/hub.py
@@ -193,9 +193,12 @@ class BaseHub(object):
             return None
         return t[0][0]
 
-    def run(self):
+    def run(self, *a, **kw):
         """Run the runloop until abort is called.
         """
+        # accept and discard variable arguments because they will be
+        # supplied if other greenlets have run and exited before the
+        # hub's greenlet gets a chance to run
         if self.running:
             raise RuntimeError("Already running!")
         try: