diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-07-07 16:08:22 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-07-07 16:08:22 (GMT) |
| commit | 799a60ccb4efec5e01c076f0a9b08ed7f4b3fc10 (patch) | |
| tree | 7b0eff0337c4d4b28d096ded37fcde22259a3930 /Lib | |
| parent | 1a870c913238e6e2178283b1d69e9be9203473f2 (diff) | |
| download | cpython-799a60ccb4efec5e01c076f0a9b08ed7f4b3fc10.zip cpython-799a60ccb4efec5e01c076f0a9b08ed7f4b3fc10.tar.gz cpython-799a60ccb4efec5e01c076f0a9b08ed7f4b3fc10.tar.bz2 | |
asyncio: sync with Tulip
Backout the "Tulip issue 181: Faster create_connection()" changeset, it was a
mistake.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/asyncio/proactor_events.py | 2 | ||||
| -rw-r--r-- | Lib/asyncio/selector_events.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index 23545c9..a80876f 100644 --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -38,7 +38,7 @@ class _ProactorBasePipeTransport(transports._FlowControlMixin, self._server.attach(self) self._loop.call_soon(self._protocol.connection_made, self) if waiter is not None: - waiter.set_result(None) + self._loop.call_soon(waiter._set_result_unless_cancelled, None) def _set_extra(self, sock): self._extra['pipe'] = sock diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index 628efb7..2a17034 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: - waiter.set_result(None) + self._loop.call_soon(waiter._set_result_unless_cancelled, None) def pause_reading(self): if self._closing: |