From: Victor Stinner Date: Mon, 7 Jul 2014 16:08:22 +0000 (+0200) Subject: asyncio: sync with Tulip X-Git-Tag: v3.4.2rc1~259 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=799a60ccb4efec5e01c076f0a9b08ed7f4b3fc10;p=python asyncio: sync with Tulip Backout the "Tulip issue 181: Faster create_connection()" changeset, it was a mistake. --- diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index 23545c9ee9..a80876f366 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 628efb750c..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: - waiter.set_result(None) + self._loop.call_soon(waiter._set_result_unless_cancelled, None) def pause_reading(self): if self._closing: