mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-29 05:05:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Closes #21886, #21447: Fix a race condition in asyncio when setting the result

Browse source 
of a Future with call_soon(). Add an helper, a private method, to set the
result only if the future was not cancelled.
This commit is contained in:
Victor Stinner 2014-07-05 15:29:41 +02:00
parent 5021cb553c
commit a9acbe82e7
9 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/asyncio/selector_events.py
View 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:
self._loop.call_soon(waiter.set_result, None)
self._loop.call_soon(waiter._set_result_unless_cancelled, None)
def pause_reading(self):
if self._closing:
@ -690,7 +690,8 @@ class _SelectorSslTransport(_SelectorTransport):
self._loop.add_reader(self._sock_fd, self._read_ready)
self._loop.call_soon(self._protocol.connection_made, self)
if self._waiter is not None:
self._loop.call_soon(self._waiter.set_result, None)
self._loop.call_soon(self._waiter._set_result_unless_cancelled,
None)
def pause_reading(self):
# XXX This is a bit icky, given the comment at the top of