moved selection of greenlet implementation into eventlet.support.greenlet module

eventlet/api.py

@@ -30,27 +30,7 @@ import linecache
 import inspect
 import traceback
 
-try:
-    import greenlet
-except ImportError:
-    try:
-        import support.pylib
-        support.pylib.emulate()
-        greenlet = sys.modules['greenlet']
-    except ImportError:
-        try:
-            import support.stacklesspypys
-            support.stacklesspypys.emulate()
-            greenlet = sys.modules['greenlet']
-        except ImportError:
-            try:
-                import support.stacklesss
-                support.stacklesss.emulate()
-                greenlet = sys.modules['greenlet']                
-            except ImportError, e:
-                raise ImportError("Unable to find an implementation of greenlet.")
-
-
+from eventlet.support import greenlet
 from eventlet import greenlib, tls
 
 __all__ = [

eventlet/channel.py

@@ -26,8 +26,7 @@ THE SOFTWARE.
 import collections
 
 from eventlet import api, greenlib
-
-import greenlet
+from eventlet.support import greenlet
 
 __all__ = ['channel']
 

eventlet/greenlib.py

@@ -25,7 +25,7 @@ THE SOFTWARE.
 import sys
 import itertools
 
-import greenlet
+from eventlet.support import greenlet
 
 from eventlet import tls
 

eventlet/gthreadless.py

@@ -1,4 +1,4 @@
-import greenlet
+from eventlet.support import greenlet
 greenlet.main = greenlet.getcurrent() # WTF did greenlet.main go?
 from twisted.internet import defer, reactor
 

eventlet/hubs/hub.py

@@ -29,7 +29,7 @@ import errno
 import traceback
 import time
 
-import greenlet
+from eventlet.support import greenlet
 
 from eventlet import greenlib
 from eventlet.timer import Timer

eventlet/hubs/libev.py

@@ -33,7 +33,7 @@ from eventlet import greenlib
 from eventlet.timer import Timer
 from eventlet.hubs import hub
 
-import greenlet
+from eventlet.support import greenlet
 
 # XXX for debugging only
 #raise ImportError()

eventlet/hubs/libevent.py

@@ -33,7 +33,7 @@ from eventlet import greenlib
 from eventlet.timer import Timer
 from eventlet.hubs import hub
 
-import greenlet
+from eventlet.support import greenlet
 
 # XXX for debugging only
 #raise ImportError()

eventlet/hubs/selecthub.py

@@ -28,8 +28,7 @@ import errno
 import time
 
 from eventlet.hubs import hub
-
-import greenlet
+from eventlet.support import greenlet
 
 class Hub(hub.BaseHub):
     def wait(self, seconds=None):

eventlet/hubs/selects.py

@@ -29,7 +29,7 @@ import time
 
 from eventlet.hubs import hub
 
-import greenlet
+from eventlet.support import greenlet
 
 class Hub(hub.BaseHub):
     def wait(self, seconds=None):

eventlet/support/greenlet.py

@@ -0,0 +1,14 @@
+try:
+    from py.magic import greenlet
+    getcurrent = greenlet.getcurrent
+    GreenletExit = greenlet.GreenletExit
+except ImportError:
+    try:
+        from stackless import greenlet
+        getcurrent = greenlet.getcurrent
+        GreenletExit = greenlet.GreenletExit
+    except ImportError:
+        try:
+            from support.stacklesss import greenlet, getcurrent, GreenletExit
+        except ImportError, e:
+            raise ImportError("Unable to find an implementation of greenlet.")

eventlet/util.py

@@ -48,7 +48,7 @@ except ImportError:
 
 def g_log(*args):
     import sys
-    import greenlet
+    from eventlet.support import greenlet
     from eventlet.greenlib import greenlet_id
     g_id = greenlet_id()
     if g_id is None: