diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-07-05 13:30:42 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-07-05 13:30:42 (GMT) |
| commit | 8c57548f89846389a13c6ea1c7160d95aafa7110 (patch) | |
| tree | 4223575402a183571899dafe548b98d070201b15 /Lib/asyncio/unix_events.py | |
| parent | e8b59dac125769a8436c8b08271446029353b24c (diff) | |
| parent | a9acbe82e7822e555b669139fdd8a7cb7667492c (diff) | |
| download | cpython-8c57548f89846389a13c6ea1c7160d95aafa7110.zip cpython-8c57548f89846389a13c6ea1c7160d95aafa7110.tar.gz cpython-8c57548f89846389a13c6ea1c7160d95aafa7110.tar.bz2 | |
(Merge 3.4) 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/unix_events.py')
| -rw-r--r-- | Lib/asyncio/unix_events.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py index 5f728b5..535ea22 100644 --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -269,7 +269,7 @@ class _UnixReadPipeTransport(transports.ReadTransport): self._loop.add_reader(self._fileno, 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 _read_ready(self): try: @@ -353,7 +353,7 @@ class _UnixWritePipeTransport(transports._FlowControlMixin, 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 get_write_buffer_size(self): return sum(len(data) for data in self._buffer) |