mirror of
https://github.com/python/cpython.git
synced 2025-11-09 18:11:38 +00:00
bpo-32528: Make asyncio.CancelledError a BaseException. (GH-13528)
This will address the common mistake many asyncio users make: an "except Exception" clause breaking Tasks cancellation. In addition to this change, we stop inheriting asyncio.TimeoutError and asyncio.InvalidStateError from their concurrent.futures.* counterparts. There's no point for these exceptions to share the inheritance chain. In 3.9 we'll focus on implementing supervisors and cancel scopes, which should allow better handling of all exceptions, including SystemExit and KeyboardInterrupt
This commit is contained in:
parent
16cefb0bc7
commit
431b540bf7
16 changed files with 147 additions and 67 deletions
|
|
@ -194,7 +194,9 @@ async def _make_subprocess_transport(self, protocol, args, shell,
|
|||
self._child_watcher_callback, transp)
|
||||
try:
|
||||
await waiter
|
||||
except Exception:
|
||||
except (SystemExit, KeyboardInterrupt):
|
||||
raise
|
||||
except BaseException:
|
||||
transp.close()
|
||||
await transp._wait()
|
||||
raise
|
||||
|
|
@ -390,7 +392,9 @@ def _sock_sendfile_native_impl(self, fut, registered_fd, sock, fileno,
|
|||
else:
|
||||
self._sock_sendfile_update_filepos(fileno, offset, total_sent)
|
||||
fut.set_exception(exc)
|
||||
except Exception as exc:
|
||||
except (SystemExit, KeyboardInterrupt):
|
||||
raise
|
||||
except BaseException as exc:
|
||||
self._sock_sendfile_update_filepos(fileno, offset, total_sent)
|
||||
fut.set_exception(exc)
|
||||
else:
|
||||
|
|
@ -641,7 +645,9 @@ def write(self, data):
|
|||
n = os.write(self._fileno, data)
|
||||
except (BlockingIOError, InterruptedError):
|
||||
n = 0
|
||||
except Exception as exc:
|
||||
except (SystemExit, KeyboardInterrupt):
|
||||
raise
|
||||
except BaseException as exc:
|
||||
self._conn_lost += 1
|
||||
self._fatal_error(exc, 'Fatal write error on pipe transport')
|
||||
return
|
||||
|
|
@ -661,7 +667,9 @@ def _write_ready(self):
|
|||
n = os.write(self._fileno, self._buffer)
|
||||
except (BlockingIOError, InterruptedError):
|
||||
pass
|
||||
except Exception as exc:
|
||||
except (SystemExit, KeyboardInterrupt):
|
||||
raise
|
||||
except BaseException as exc:
|
||||
self._buffer.clear()
|
||||
self._conn_lost += 1
|
||||
# Remove writer here, _fatal_error() doesn't it
|
||||
|
|
@ -879,7 +887,9 @@ def attach_loop(self, loop):
|
|||
def _sig_chld(self):
|
||||
try:
|
||||
self._do_waitpid_all()
|
||||
except Exception as exc:
|
||||
except (SystemExit, KeyboardInterrupt):
|
||||
raise
|
||||
except BaseException as exc:
|
||||
# self._loop should always be available here
|
||||
# as '_sig_chld' is added as a signal handler
|
||||
# in 'attach_loop'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue