diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2015-11-17 17:20:26 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2015-11-17 17:20:26 (GMT) |
| commit | 4990289bbf6d51130855fd0a54c3726f60ee9fdf (patch) | |
| tree | 90650af56f9495acf7ea19045e2e61d5eadfb45c /Lib/asyncio/proactor_events.py | |
| parent | cfcc2bdcb2e721050fc0ddbdafd2f6452b845a24 (diff) | |
| parent | 5498f2b6bf6d2ff7a1575a7a07ca1175f8226853 (diff) | |
| download | cpython-4990289bbf6d51130855fd0a54c3726f60ee9fdf.zip cpython-4990289bbf6d51130855fd0a54c3726f60ee9fdf.tar.gz cpython-4990289bbf6d51130855fd0a54c3726f60ee9fdf.tar.bz2 | |
Merge 3.5
Diffstat (limited to 'Lib/asyncio/proactor_events.py')
| -rw-r--r-- | Lib/asyncio/proactor_events.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index 9c514c8..7eac41e 100644 --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -41,7 +41,8 @@ class _ProactorBasePipeTransport(transports._FlowControlMixin, self._loop.call_soon(self._protocol.connection_made, self) 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 __repr__(self): info = [self.__class__.__name__] |