]> granicus.if.org Git - python/commitdiff
asyncio: sync with Tulip
authorVictor Stinner <victor.stinner@gmail.com>
Mon, 7 Jul 2014 16:08:22 +0000 (18:08 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Mon, 7 Jul 2014 16:08:22 +0000 (18:08 +0200)
Backout the "Tulip issue 181: Faster create_connection()" changeset, it was a
mistake.

Lib/asyncio/proactor_events.py
Lib/asyncio/selector_events.py

index 23545c9ee9d6626ca29f0693409014633de73eab..a80876f366a40ab9b55f0600479880f85700144d 100644 (file)
@@ -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
index 628efb750ca1a8e1832687b5ca061247e77ac411..2a170340b9e90ed8c6f87c26893eceb74ad5051e 100644 (file)
@@ -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: