mirror of
https://github.com/python/cpython
synced 2026-09-29 12:10:30 +03: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
|
|
@ -8,7 +8,6 @@ import concurrent.futures
|
|||
import contextvars
|
||||
import logging
|
||||
import sys
|
||||
import warnings
|
||||
from types import GenericAlias
|
||||
|
||||
from . import base_futures
|
||||
|
|
@ -151,11 +150,6 @@ class Future:
|
|||
change the future's state to cancelled, schedule the callbacks and
|
||||
return True.
|
||||
"""
|
||||
if msg is not None:
|
||||
warnings.warn("Passing 'msg' argument to Future.cancel() "
|
||||
"is deprecated since Python 3.11, and "
|
||||
"scheduled for removal in Python 3.14.",
|
||||
DeprecationWarning, stacklevel=2)
|
||||
self.__log_traceback = False
|
||||
if self._state != _PENDING:
|
||||
return False
|
||||
|
|
|
|||
|
|
@ -210,11 +210,6 @@ class Task(futures._PyFuture): # Inherit Python Task implementation
|
|||
|
||||
This also increases the task's count of cancellation requests.
|
||||
"""
|
||||
if msg is not None:
|
||||
warnings.warn("Passing 'msg' argument to Task.cancel() "
|
||||
"is deprecated since Python 3.11, and "
|
||||
"scheduled for removal in Python 3.14.",
|
||||
DeprecationWarning, stacklevel=2)
|
||||
self._log_traceback = False
|
||||
if self.done():
|
||||
return False
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue