diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-07-07 13:46:09 +0300 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-07-07 13:46:09 +0300 |
| commit | 3bc13cc8b0b85f989b8da9c5718fc5319ad06248 (patch) | |
| tree | 52fc5995a7cc1ccafce61ef403b7dea1a4ff342d /Lib/asyncio/selector_events.py | |
| parent | 667abc7d42e87b87338981276d0eac9895d4abf4 (diff) | |
| parent | e50dafcd636ba32db890600164698bb070d40d97 (diff) | |
| download | cpython-git-3bc13cc8b0b85f989b8da9c5718fc5319ad06248.tar.gz | |
Merge heads
Diffstat (limited to 'Lib/asyncio/selector_events.py')
| -rw-r--r-- | Lib/asyncio/selector_events.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index df64aece3b..2a170340b9 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -481,7 +481,7 @@ class _SelectorSocketTransport(_SelectorTransport): self._loop.add_reader(self._sock_fd, self._read_ready) self._loop.call_soon(self._protocol.connection_made, self) if waiter is not None: - self._loop.call_soon(waiter.set_result, None) + self._loop.call_soon(waiter._set_result_unless_cancelled, None) def pause_reading(self): if self._closing: @@ -690,7 +690,8 @@ class _SelectorSslTransport(_SelectorTransport): self._loop.add_reader(self._sock_fd, self._read_ready) self._loop.call_soon(self._protocol.connection_made, self) if self._waiter is not None: - self._loop.call_soon(self._waiter.set_result, None) + self._loop.call_soon(self._waiter._set_result_unless_cancelled, + None) def pause_reading(self): # XXX This is a bit icky, given the comment at the top of |