mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
GH-90985: Revert "Deprecate passing a message into cancel()" (#97999)
Reason: we were too hasty in deprecating this. We shouldn't deprecate it before we have a replacement.
This commit is contained in:
parent
c46a423a52
commit
09de8d7aaf
8 changed files with 12 additions and 102 deletions
|
@ -197,11 +197,6 @@ Future Object
|
|||
.. versionchanged:: 3.9
|
||||
Added the *msg* parameter.
|
||||
|
||||
.. deprecated-removed:: 3.11 3.14
|
||||
*msg* parameter is ambiguous when multiple :meth:`cancel`
|
||||
are called with different cancellation messages.
|
||||
The argument will be removed.
|
||||
|
||||
.. method:: exception()
|
||||
|
||||
Return the exception that was set on this Future.
|
||||
|
@ -282,8 +277,3 @@ the Future has a result::
|
|||
|
||||
- :meth:`asyncio.Future.cancel` accepts an optional ``msg`` argument,
|
||||
but :func:`concurrent.futures.cancel` does not.
|
||||
|
||||
.. deprecated-removed:: 3.11 3.14
|
||||
*msg* parameter is ambiguous when multiple :meth:`cancel`
|
||||
are called with different cancellation messages.
|
||||
The argument will be removed.
|
||||
|
|
|
@ -1144,10 +1144,8 @@ Task Object
|
|||
.. versionchanged:: 3.9
|
||||
Added the *msg* parameter.
|
||||
|
||||
.. deprecated-removed:: 3.11 3.14
|
||||
*msg* parameter is ambiguous when multiple :meth:`cancel`
|
||||
are called with different cancellation messages.
|
||||
The argument will be removed.
|
||||
.. versionchanged:: 3.11
|
||||
The ``msg`` parameter is propagated from cancelled task to its awaiter.
|
||||
|
||||
.. _asyncio_example_task_cancel:
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue