summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/staggered.py
diff options
context:
space:
mode:
authorYury Selivanov <yury@magic.io>2019-05-27 12:45:12 (GMT)
committerGitHub <noreply@github.com>2019-05-27 12:45:12 (GMT)
commit431b540bf79f0982559b1b0e420b1b085f667bb7 (patch)
tree2e7027339ce786cc90e04cba1b03c71ecf38dfda /Lib/asyncio/staggered.py
parent16cefb0bc7b05c08caf08525398ff178c35dece4 (diff)
downloadcpython-431b540bf79f0982559b1b0e420b1b085f667bb7.zip
cpython-431b540bf79f0982559b1b0e420b1b085f667bb7.tar.gz
cpython-431b540bf79f0982559b1b0e420b1b085f667bb7.tar.bz2
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/staggered.py')
-rw-r--r--Lib/asyncio/staggered.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/asyncio/staggered.py b/Lib/asyncio/staggered.py
index feec681..27c665a 100644
--- a/Lib/asyncio/staggered.py
+++ b/Lib/asyncio/staggered.py
@@ -105,7 +105,9 @@ async def staggered_race(
try:
result = await coro_fn()
- except Exception as e:
+ except (SystemExit, KeyboardInterrupt):
+ raise
+ except BaseException as e:
exceptions[this_index] = e
this_failed.set() # Kickstart the next coroutine
else: