summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/selector_events.py
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-11-17 17:20:02 (GMT)
committerYury Selivanov <yselivanov@sprymix.com>2015-11-17 17:20:02 (GMT)
commit5498f2b6bf6d2ff7a1575a7a07ca1175f8226853 (patch)
tree245ec297bfdbf24c8ba15723f4b75fda468eb60a /Lib/asyncio/selector_events.py
parent7f324ba735dff39b7209717b646d3c96acd49ccf (diff)
parent5d7e3b6cd208dffdfe8530664081b62e0c7e3092 (diff)
downloadcpython-5498f2b6bf6d2ff7a1575a7a07ca1175f8226853.zip
cpython-5498f2b6bf6d2ff7a1575a7a07ca1175f8226853.tar.gz
cpython-5498f2b6bf6d2ff7a1575a7a07ca1175f8226853.tar.bz2
Merge 3.4
Diffstat (limited to 'Lib/asyncio/selector_events.py')
-rw-r--r--Lib/asyncio/selector_events.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
index 236f7b3..a05f81c 100644
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -636,7 +636,8 @@ class _SelectorSocketTransport(_SelectorTransport):
self._sock_fd, self._read_ready)
if waiter is not None:
# only wake up the waiter when connection_made() has been called
- self._loop.call_soon(waiter._set_result_unless_cancelled, None)
+ self._loop.call_soon(futures._set_result_unless_cancelled,
+ waiter, None)
def pause_reading(self):
if self._closing:
@@ -990,7 +991,8 @@ class _SelectorDatagramTransport(_SelectorTransport):
self._sock_fd, self._read_ready)
if waiter is not None:
# only wake up the waiter when connection_made() has been called
- self._loop.call_soon(waiter._set_result_unless_cancelled, None)
+ self._loop.call_soon(futures._set_result_unless_cancelled,
+ waiter, None)
def get_write_buffer_size(self):
return sum(len(data) for data, _ in self._buffer)