summaryrefslogtreecommitdiff
path: root/Lib/asyncio/proactor_events.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-07-07 18:08:22 +0200
committerVictor Stinner <victor.stinner@gmail.com>2014-07-07 18:08:22 +0200
commit799a60ccb4efec5e01c076f0a9b08ed7f4b3fc10 (patch)
tree7b0eff0337c4d4b28d096ded37fcde22259a3930 /Lib/asyncio/proactor_events.py
parent1a870c913238e6e2178283b1d69e9be9203473f2 (diff)
downloadcpython-git-799a60ccb4efec5e01c076f0a9b08ed7f4b3fc10.tar.gz
asyncio: sync with Tulip
Backout the "Tulip issue 181: Faster create_connection()" changeset, it was a mistake.
Diffstat (limited to 'Lib/asyncio/proactor_events.py')
-rw-r--r--Lib/asyncio/proactor_events.py2
1 files changed, 1 insertions, 1 deletions
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