openstack/deb-python-eventlet
Code Issues Proposed changes

made trampoline compatible with non-twisted hubs

Browse Source
This commit is contained in:
Denis Bilenko
2008-10-27 22:44:45 +06:00
parent 3eb2512c5a
commit 2eb3ea3f29
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eventlet/api.py
View File

@@ -137,11 +137,11 @@ def trampoline(fd, read=None, write=None, timeout=None, timeout_exc=TimeoutError
hub = get_hub()
self = greenlet.getcurrent()
fileno = getattr(fd, 'fileno', lambda: fd)()
def _do_close(_d, error):
def _do_close(_d, error=None):
if t is not None:
t.cancel()
hub.remove_descriptor(descriptor)
greenlib.switch(self, exc=error.value) # convert to socket.error
greenlib.switch(self, exc=getattr(error, 'value', None)) # convert to socket.error
def _do_timeout():
hub.remove_descriptor(descriptor)
greenlib.switch(self, exc=timeout_exc())