openstack/deb-python-eventlet
Code Issues Proposed changes

Trampolines that don't have a timeout don't need a timeout_exc.

Browse Source
This commit is contained in:
Ryan Williams
2010-02-24 04:45:46 -05:00
parent da4448f811
commit a6ef92d429
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eventlet/greenio.py
View File

@@ -171,8 +171,7 @@ class GreenSocket(object):
fd = self.fd fd = self.fd
if self.gettimeout() is None: if self.gettimeout() is None:
while not socket_connect(fd, address): while not socket_connect(fd, address):
trampoline(fd, write=True, trampoline(fd, write=True)
timeout_exc=socket.timeout("timed out"))
else: else:
end = time.time() + self.gettimeout() end = time.time() + self.gettimeout()
while True: while True:
@@ -190,8 +189,7 @@ class GreenSocket(object):
if self.gettimeout() is None: if self.gettimeout() is None:
while not socket_connect(fd, address): while not socket_connect(fd, address):
try: try:
trampoline(fd, write=True, trampoline(fd, write=True)
timeout_exc=socket.timeout(errno.EAGAIN))
except socket.error, ex: except socket.error, ex:
return ex[0] return ex[0]
else: else:
@@ -304,7 +302,7 @@ class GreenSocket(object):
tail += self.send(data[tail:], flags) tail += self.send(data[tail:], flags)
def sendto(self, *args): def sendto(self, *args):
trampoline(self.fd, write=True, timeout_exc=socket.timeout("timed out")) trampoline(self.fd, write=True)
return self.fd.sendto(*args) return self.fd.sendto(*args)
def setblocking(self, flag): def setblocking(self, flag):