openstack/deb-python-eventlet
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Denis Bilenko
2008-10-07 15:57:54 +07:00
parent 043651e5a8
commit b69aec4e26
11 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
eventlet/api.py
View File

@@ -30,27 +30,7 @@ import linecache
import inspect import inspect
import traceback import traceback
try: from eventlet.support import greenlet
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 import greenlib, tls from eventlet import greenlib, tls
__all__ = [ __all__ = [

3
eventlet/channel.py
View File

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

2
eventlet/greenlib.py
View File

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

2
eventlet/gthreadless.py
View File

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

2
eventlet/hubs/hub.py
View File

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

2
eventlet/hubs/libev.py
View File

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

2
eventlet/hubs/libevent.py
View File

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

3
eventlet/hubs/selecthub.py
View File

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

2
eventlet/hubs/selects.py
View File

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

14
eventlet/support/greenlet.py Normal file
View File

@@ -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.")

2
eventlet/util.py
View File

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