Improve deprecation messages for many backported deprecations

AlexWaygood · AlexWaygood · commit 7aa96f9ea898 · 2026-07-21T17:24:04.000+01:00
diff --git a/stdlib/argparse.pyi b/stdlib/argparse.pyi
@@ -103,7 +103,7 @@ class _ActionsContainer:
         conflict_handler: str = ...,
     ) -> _ArgumentGroup: ...
     @overload
-    @deprecated("The `prefix_chars` parameter deprecated since Python 3.14.")
+    @deprecated("The `prefix_chars` parameter is deprecated.")
     def add_argument_group(
         self,
         title: str | None = None,
@@ -530,7 +530,7 @@ class Namespace(_AttributeHolder):
     def __eq__(self, other: object) -> bool: ...
     __hash__: ClassVar[None]  # type: ignore[assignment]
 
-@deprecated("Deprecated since Python 3.14. Open files after parsing arguments instead.")
+@deprecated("Deprecated; may leave files open. Open files after parsing arguments instead.")
 class FileType:
     # undocumented
     _mode: str
@@ -556,7 +556,7 @@ class _ArgumentGroup(_ActionsContainer):
         conflict_handler: str = ...,
     ) -> None: ...
     @overload
-    @deprecated("Undocumented `prefix_chars` parameter is deprecated since Python 3.14.")
+    @deprecated("Undocumented `prefix_chars` parameter is deprecated.")
     def __init__(
         self,
         container: _ActionsContainer,
diff --git a/stdlib/asyncio/events.pyi b/stdlib/asyncio/events.pyi
@@ -633,10 +633,10 @@ else:
         def new_event_loop(self) -> AbstractEventLoop: ...
         # Child processes handling (Unix only).
         @abstractmethod
-        @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
+        @deprecated("Deprecated; removed in Python 3.14.")
         def get_child_watcher(self) -> AbstractChildWatcher: ...
         @abstractmethod
-        @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
+        @deprecated("Deprecated; removed in Python 3.14.")
         def set_child_watcher(self, watcher: AbstractChildWatcher) -> None: ...
 
     AbstractEventLoopPolicy = _AbstractEventLoopPolicy
@@ -657,15 +657,15 @@ if sys.version_info >= (3, 14):
     def _get_event_loop_policy() -> _AbstractEventLoopPolicy: ...
     def _set_event_loop_policy(policy: _AbstractEventLoopPolicy | None) -> None: ...
 
-@deprecated("Deprecated since Python 3.14; will be removed in Python 3.16.")
+@deprecated("Deprecated; will be removed in Python 3.16.")
 def get_event_loop_policy() -> _AbstractEventLoopPolicy: ...
-@deprecated("Deprecated since Python 3.14; will be removed in Python 3.16.")
+@deprecated("Deprecated; will be removed in Python 3.16.")
 def set_event_loop_policy(policy: _AbstractEventLoopPolicy | None) -> None: ...
 def set_event_loop(loop: AbstractEventLoop | None) -> None: ...
 def new_event_loop() -> AbstractEventLoop: ...
 
 if sys.version_info < (3, 14):
-    @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
+    @deprecated("Deprecated; removed in Python 3.14.")
     def get_child_watcher() -> AbstractChildWatcher: ...
-    @deprecated("Deprecated since Python 3.12; removed in Python 3.14.")
+    @deprecated("Deprecated; removed in Python 3.14.")
     def set_child_watcher(watcher: AbstractChildWatcher) -> None: ...
diff --git a/stdlib/ctypes/__init__.pyi b/stdlib/ctypes/__init__.pyi
@@ -168,10 +168,10 @@ c_buffer = create_string_buffer
 def create_unicode_buffer(init: int | str, size: int | None = None) -> Array[c_wchar]: ...
 
 if sys.version_info < (3, 15):
-    @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
+    @deprecated("Deprecated; will be removed in Python 3.15.")
     def SetPointerType(pointer: type[_Pointer[Any]], cls: _CTypeBaseType) -> None: ...
 
-@deprecated("Soft deprecated since Python 3.13. Use multiplication instead.")
+@deprecated("Soft deprecated. Use multiplication instead.")
 def ARRAY(typ: _CT, len: int) -> Array[_CT]: ...
 
 if sys.platform == "win32":
diff --git a/stdlib/http/server.pyi b/stdlib/http/server.pyi
@@ -128,7 +128,7 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
 def executable(path: StrPath) -> bool: ...  # undocumented
 
 if sys.version_info < (3, 15):
-    @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
+    @deprecated("Deprecated and unsafe; will be removed in Python 3.15.")
     class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
         cgi_directories: list[str]
         have_fork: bool  # undocumented
diff --git a/stdlib/importlib/resources/__init__.pyi b/stdlib/importlib/resources/__init__.pyi
@@ -62,7 +62,7 @@ else:
     def read_text(package: Package, resource: Resource, encoding: str = "utf-8", errors: str = "strict") -> str: ...
     def path(package: Package, resource: Resource) -> AbstractContextManager[Path, Literal[False]]: ...
     def is_resource(package: Package, name: str) -> bool: ...
-    @deprecated("Deprecated since Python 3.11. Use `files(anchor).iterdir()`.")
+    @deprecated("Deprecated; limited resource support. Use `files(anchor).iterdir()`.")
     def contents(package: Package) -> Iterator[str]: ...
 
 if sys.version_info >= (3, 11):
diff --git a/stdlib/locale.pyi b/stdlib/locale.pyi
@@ -138,7 +138,7 @@ def getpreferredencoding(do_setlocale: bool = True) -> _str: ...
 def normalize(localename: _str) -> _str: ...
 
 if sys.version_info < (3, 13):
-    @deprecated("Deprecated since Python 3.11; removed in Python 3.13. Use `locale.setlocale(locale.LC_ALL, '')` instead.")
+    @deprecated("Deprecated; removed in Python 3.13. Use `locale.setlocale(locale.LC_ALL, '')` instead.")
     def resetlocale(category: int = ...) -> None: ...
 
 if sys.version_info < (3, 12):
diff --git a/stdlib/nturl2path.pyi b/stdlib/nturl2path.pyi
@@ -1,6 +1,6 @@
 from typing_extensions import deprecated
 
-@deprecated("The `nturl2path` module is deprecated since Python 3.14.")
+@deprecated("Deprecated; use `urllib.request` file-URL helpers instead.")
 def url2pathname(url: str) -> str: ...
-@deprecated("The `nturl2path` module is deprecated since Python 3.14.")
+@deprecated("Deprecated; use `urllib.request` file-URL helpers instead.")
 def pathname2url(p: str) -> str: ...
diff --git a/stdlib/pathlib/__init__.pyi b/stdlib/pathlib/__init__.pyi
@@ -112,7 +112,7 @@ class PurePath(PathLike[str]):
         @overload
         def is_relative_to(self, other: StrPath, /) -> bool: ...
         @overload
-        @deprecated("Passing additional arguments is deprecated since Python 3.12; removed in Python 3.14.")
+        @deprecated("Passing additional arguments is deprecated; removed in Python 3.14.")
         def is_relative_to(self, other: StrPath, /, *_deprecated: StrPath) -> bool: ...
 
     if sys.version_info >= (3, 12):
diff --git a/stdlib/pkgutil.pyi b/stdlib/pkgutil.pyi
@@ -39,9 +39,9 @@ if sys.version_info < (3, 12):
         def __init__(self, fullname: str, file: IO[str], filename: StrOrBytesPath, etc: tuple[str, str, int]) -> None: ...
 
 if sys.version_info < (3, 14):
-    @deprecated("Deprecated since Python 3.12; removed in Python 3.14. Use `importlib.util.find_spec()` instead.")
+    @deprecated("Deprecated; removed in Python 3.14. Use `importlib.util.find_spec()` instead.")
     def find_loader(fullname: str) -> LoaderProtocol | None: ...
-    @deprecated("Deprecated since Python 3.12; removed in Python 3.14. Use `importlib.util.find_spec()` instead.")
+    @deprecated("Deprecated; removed in Python 3.14. Use `importlib.util.find_spec()` instead.")
     def get_loader(module_or_name: str) -> LoaderProtocol | None: ...
 
 def get_importer(path_item: StrOrBytesPath) -> PathEntryFinderProtocol | None: ...
diff --git a/stdlib/pty.pyi b/stdlib/pty.pyi
@@ -15,9 +15,9 @@ if sys.platform != "win32":
     def openpty() -> tuple[int, int]: ...
 
     if sys.version_info < (3, 14):
-        @deprecated("Deprecated since Python 3.12; removed in Python 3.14. Use `openpty()` instead.")
+        @deprecated("Deprecated; removed in Python 3.14. Use `openpty()` instead.")
         def master_open() -> tuple[int, str]: ...
-        @deprecated("Deprecated since Python 3.12; removed in Python 3.14. Use `openpty()` instead.")
+        @deprecated("Deprecated; removed in Python 3.14. Use `openpty()` instead.")
         def slave_open(tty_name: str) -> int: ...
 
     def fork() -> tuple[int, int]: ...
diff --git a/stdlib/pydoc.pyi b/stdlib/pydoc.pyi
@@ -32,7 +32,7 @@ def stripid(text: str) -> str: ...
 def allmethods(cl: type) -> MutableMapping[str, MethodType]: ...
 def visiblename(name: str, all: Container[str] | None = None, obj: object = None) -> bool: ...
 def classify_class_attrs(object: object) -> list[tuple[str, str, type, str]]: ...
-@deprecated("Deprecated since Python 3.13.")
+@deprecated("Deprecated.")
 def ispackage(path: StrPath) -> bool: ...  # undocumented
 def source_synopsis(file: IO[AnyStr]) -> AnyStr | None: ...
 def synopsis(filename: str, cache: MutableMapping[str, tuple[int, str]] = {}) -> str | None: ...
diff --git a/stdlib/re.pyi b/stdlib/re.pyi
@@ -342,5 +342,5 @@ def escape(pattern: AnyStr) -> AnyStr: ...
 def purge() -> None: ...
 
 if sys.version_info < (3, 13):
-    @deprecated("Deprecated since Python 3.11; removed in Python 3.13. Use `re.compile()` instead.")
+    @deprecated("Deprecated; removed in Python 3.13. Use `re.compile()` instead.")
     def template(pattern: AnyStr | Pattern[AnyStr], flags: _FlagsType = 0) -> Pattern[AnyStr]: ...  # undocumented
diff --git a/stdlib/symtable.pyi b/stdlib/symtable.pyi
@@ -56,7 +56,7 @@ class Function(SymbolTable):
     def get_nonlocals(self) -> tuple[str, ...]: ...
 
 class Class(SymbolTable):
-    @deprecated("Deprecated since Python 3.14; will be removed in Python 3.16.")
+    @deprecated("Deprecated; will be removed in Python 3.16.")
     def get_methods(self) -> tuple[str, ...]: ...
 
 class Symbol:
diff --git a/stdlib/sysconfig.pyi b/stdlib/sysconfig.pyi
@@ -45,13 +45,13 @@ elif sys.version_info >= (3, 11):
     @overload
     def is_python_build() -> bool: ...
     @overload
-    @deprecated("The `check_home` parameter is deprecated since Python 3.12; removed in Python 3.15.")
+    @deprecated("The `check_home` parameter is deprecated; removed in Python 3.15.")
     def is_python_build(check_home: object = None) -> bool: ...
 else:
     @overload
     def is_python_build() -> bool: ...
     @overload
-    @deprecated("The `check_home` parameter is deprecated since Python 3.12; removed in Python 3.15.")
+    @deprecated("The `check_home` parameter is deprecated; removed in Python 3.15.")
     def is_python_build(check_home: bool = False) -> bool: ...
 
 def parse_config_h(fp: IO[Any], vars: dict[str, Any] | None = None) -> dict[str, Any]: ...
diff --git a/stdlib/tarfile.pyi b/stdlib/tarfile.pyi
@@ -812,10 +812,10 @@ class TarInfo:
     def __init__(self, name: str = "") -> None: ...
 
     @property
-    @deprecated("Deprecated since Python 3.13; will be removed in Python 3.16.")
+    @deprecated("Deprecated; will be removed in Python 3.16.")
     def tarfile(self) -> TarFile | None: ...
     @tarfile.setter
-    @deprecated("Deprecated since Python 3.13; will be removed in Python 3.16.")
+    @deprecated("Deprecated; will be removed in Python 3.16.")
     def tarfile(self, tarfile: TarFile | None) -> None: ...
 
     @classmethod
diff --git a/stdlib/tkinter/__init__.pyi b/stdlib/tkinter/__init__.pyi
@@ -329,13 +329,13 @@ class Variable:
     def trace_add(self, mode: Literal["array", "read", "write", "unset"], callback: Callable[[str, str, str], object]) -> str: ...
     def trace_remove(self, mode: Literal["array", "read", "write", "unset"], cbname: str) -> None: ...
     def trace_info(self) -> list[tuple[tuple[Literal["array", "read", "write", "unset"], ...], str]]: ...
-    @deprecated("Deprecated since Python 3.14. Use `trace_add()` instead.")
+    @deprecated("Deprecated; will be removed in Python 3.17. Use `trace_add()` instead.")
     def trace(self, mode, callback) -> str: ...
-    @deprecated("Deprecated since Python 3.14. Use `trace_add()` instead.")
+    @deprecated("Deprecated; will be removed in Python 3.17. Use `trace_add()` instead.")
     def trace_variable(self, mode, callback) -> str: ...
-    @deprecated("Deprecated since Python 3.14. Use `trace_remove()` instead.")
+    @deprecated("Deprecated; will be removed in Python 3.17. Use `trace_remove()` instead.")
     def trace_vdelete(self, mode, cbname) -> None: ...
-    @deprecated("Deprecated since Python 3.14. Use `trace_info()` instead.")
+    @deprecated("Deprecated; will be removed in Python 3.17. Use `trace_info()` instead.")
     def trace_vinfo(self) -> list[Incomplete]: ...
     def __eq__(self, other: object) -> bool: ...
     def __del__(self) -> None: ...
diff --git a/stdlib/typing.pyi b/stdlib/typing.pyi
@@ -423,7 +423,7 @@ def overload(func: _F) -> _F: ...
 def no_type_check(arg: _F) -> _F: ...
 
 if sys.version_info < (3, 15):
-    @deprecated("Deprecated since Python 3.13; removed in Python 3.15.")
+    @deprecated("Deprecated; removed in Python 3.15.")
     def no_type_check_decorator(decorator: Callable[_P, _T]) -> Callable[_P, _T]: ...
 
 if sys.version_info >= (3, 15):
diff --git a/stdlib/unittest/loader.pyi b/stdlib/unittest/loader.pyi
@@ -35,21 +35,21 @@ class TestLoader:
 defaultTestLoader: TestLoader
 
 if sys.version_info < (3, 13):
-    @deprecated("Deprecated since Python 3.11; removed in Python 3.13.")
+    @deprecated("Deprecated; removed in Python 3.13.")
     def getTestCaseNames(
         testCaseClass: type[unittest.case.TestCase],
         prefix: str,
         sortUsing: _SortComparisonMethod = ...,
         testNamePatterns: list[str] | None = None,
     ) -> Sequence[str]: ...
-    @deprecated("Deprecated since Python 3.11; removed in Python 3.13.")
+    @deprecated("Deprecated; removed in Python 3.13.")
     def makeSuite(
         testCaseClass: type[unittest.case.TestCase],
         prefix: str = "test",
         sortUsing: _SortComparisonMethod = ...,
         suiteClass: _SuiteClass = ...,
     ) -> unittest.suite.TestSuite: ...
-    @deprecated("Deprecated since Python 3.11; removed in Python 3.13.")
+    @deprecated("Deprecated; removed in Python 3.13.")
     def findTestCases(
         module: ModuleType, prefix: str = "test", sortUsing: _SortComparisonMethod = ..., suiteClass: _SuiteClass = ...
     ) -> unittest.suite.TestSuite: ...
diff --git a/stdlib/unittest/main.pyi b/stdlib/unittest/main.pyi
@@ -64,7 +64,7 @@ class TestProgram:
         ) -> None: ...
 
     if sys.version_info < (3, 13):
-        @deprecated("Deprecated since Python 3.11; removed in Python 3.13.")
+        @deprecated("Deprecated; removed in Python 3.13.")
         def usageExit(self, msg: Any = None) -> None: ...
 
     def parseArgs(self, argv: list[str]) -> None: ...
diff --git a/stdlib/wave.pyi b/stdlib/wave.pyi
@@ -47,9 +47,9 @@ class Wave_read:
     def getcompname(self) -> str: ...
     def getparams(self) -> _wave_params: ...
     if sys.version_info < (3, 15):
-        @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
+        @deprecated("Deprecated; will be removed in Python 3.15.")
         def getmarkers(self) -> None: ...
-        @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
+        @deprecated("Deprecated; will be removed in Python 3.15.")
         def getmark(self, id: Any) -> NoReturn: ...
 
     def setpos(self, pos: int) -> None: ...
diff --git a/stdlib/webbrowser.pyi b/stdlib/webbrowser.pyi
@@ -64,7 +64,7 @@ if sys.platform == "win32":
 
 if sys.platform == "darwin":
     if sys.version_info < (3, 13):
-        @deprecated("Deprecated since Python 3.11; removed in Python 3.13.")
+        @deprecated("Deprecated; removed in Python 3.13.")
         class MacOSX(BaseBrowser):
             def __init__(self, name: str) -> None: ...
             def open(self, url: str, new: int = 0, autoraise: bool = True) -> bool: ...
