mirror of
https://github.com/python/cpython.git
synced 2025-07-09 20:35:26 +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
|
@ -5,19 +5,16 @@ __all__ = ('CancelledError', 'InvalidStateError', 'TimeoutError',
|
|||
'IncompleteReadError', 'LimitOverrunError',
|
||||
'SendfileNotAvailableError')
|
||||
|
||||
import concurrent.futures
|
||||
from . import base_futures
|
||||
|
||||
|
||||
class CancelledError(concurrent.futures.CancelledError):
|
||||
class CancelledError(BaseException):
|
||||
"""The Future or Task was cancelled."""
|
||||
|
||||
|
||||
class TimeoutError(concurrent.futures.TimeoutError):
|
||||
class TimeoutError(Exception):
|
||||
"""The operation exceeded the given deadline."""
|
||||
|
||||
|
||||
class InvalidStateError(concurrent.futures.InvalidStateError):
|
||||
class InvalidStateError(Exception):
|
||||
"""The operation is not allowed in this state."""
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue