summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/selector_events.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-01-09 00:43:04 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-01-09 00:43:04 (GMT)
commitb551fac136940975e646ba8ed97dad455890bc3b (patch)
treeb1dc7d469cd66b9cae35011c947353bd23db69ab /Lib/asyncio/selector_events.py
parent25638d3109f6de1651fc8f39799b87d5347d59ad (diff)
parent3531d9044dbfd15b3bf5ec1abe5b9744fce37464 (diff)
downloadcpython-b551fac136940975e646ba8ed97dad455890bc3b.zip
cpython-b551fac136940975e646ba8ed97dad455890bc3b.tar.gz
cpython-b551fac136940975e646ba8ed97dad455890bc3b.tar.bz2
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/selector_events.py')
-rw-r--r--Lib/asyncio/selector_events.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
index 69b649c..58b61f1 100644
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -363,15 +363,15 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop):
break
except BlockingIOError:
fut.add_done_callback(functools.partial(self._sock_connect_done,
- sock))
+ fd))
self.add_writer(fd, self._sock_connect_cb, fut, sock, address)
except Exception as exc:
fut.set_exception(exc)
else:
fut.set_result(None)
- def _sock_connect_done(self, sock, fut):
- self.remove_writer(sock.fileno())
+ def _sock_connect_done(self, fd, fut):
+ self.remove_writer(fd)
def _sock_connect_cb(self, fut, sock, address):
if fut.cancelled():