openstack/deb-python-eventlet
Code Issues Proposed changes

Fixed second-thread importing of select module. Also slight patcher fix.

Browse Source
This commit is contained in:
Ryan Williams
2010-01-08 20:03:50 -08:00
parent 9ec729c023
commit b3e52409ab
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eventlet/hubs/__init__.py
View File

@@ -1,3 +1,4 @@
import select
import sys import sys
import threading import threading
_threadlocal = threading.local() _threadlocal = threading.local()
@@ -29,7 +30,6 @@ def get_default_hub():
import eventlet.hubs.epolls import eventlet.hubs.epolls
return eventlet.hubs.epolls return eventlet.hubs.epolls
except ImportError: except ImportError:
import select
if hasattr(select, 'poll'): if hasattr(select, 'poll'):
import eventlet.hubs.poll import eventlet.hubs.poll
return eventlet.hubs.poll return eventlet.hubs.poll

2
eventlet/patcher.py
View File

@@ -60,5 +60,7 @@ def patch_function(func, *additional_modules):
for name, mod in additional_modules: for name, mod in additional_modules:
if saved[name] is not None: if saved[name] is not None:
sys.modules[name] = saved[name] sys.modules[name] = saved[name]
else:
del sys.modules[name]
return patched return patched