summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/proactor_events.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-07-05 13:29:41 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-07-05 13:29:41 (GMT)
commita9acbe82e7822e555b669139fdd8a7cb7667492c (patch)
tree6d0d3962f744ab352e231cc2aba1874531f947bb /Lib/asyncio/proactor_events.py
parent5021cb553c2c6bf7219882c36b9f6b2bdee5bd24 (diff)
downloadcpython-a9acbe82e7822e555b669139fdd8a7cb7667492c.zip
cpython-a9acbe82e7822e555b669139fdd8a7cb7667492c.tar.gz
cpython-a9acbe82e7822e555b669139fdd8a7cb7667492c.tar.bz2
Closes #21886, #21447: Fix a race condition in asyncio when setting the result
of a Future with call_soon(). Add an helper, a private method, to set the result only if the future was not cancelled.
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 b76f69e..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:
- self._loop.call_soon(waiter.set_result, None)
+ self._loop.call_soon(waiter._set_result_unless_cancelled, None)
def _set_extra(self, sock):
self._extra['pipe'] = sock