diff options
author | Yury Selivanov <yury@magic.io> | 2019-05-27 14:45:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-27 14:45:12 +0200 |
commit | 431b540bf79f0982559b1b0e420b1b085f667bb7 (patch) | |
tree | 2e7027339ce786cc90e04cba1b03c71ecf38dfda /Lib/asyncio/windows_events.py | |
parent | 16cefb0bc7b05c08caf08525398ff178c35dece4 (diff) | |
download | cpython-431b540bf79f0982559b1b0e420b1b085f667bb7.tar.gz cpython-431b540bf79f0982559b1b0e420b1b085f667bb7.zip |
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
Diffstat (limited to 'Lib/asyncio/windows_events.py')
-rw-r--r-- | Lib/asyncio/windows_events.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py index 29750f18d80..b5b2e24c5ba 100644 --- a/Lib/asyncio/windows_events.py +++ b/Lib/asyncio/windows_events.py @@ -388,7 +388,9 @@ class ProactorEventLoop(proactor_events.BaseProactorEventLoop): **kwargs) try: await waiter - except Exception: + except (SystemExit, KeyboardInterrupt): + raise + except BaseException: transp.close() await transp._wait() raise |