Replace NoReturn with Never (#16079)

Author: srittau

stdlib/@tests/test_cases/builtins/check_pow.py

@@ -15,7 +15,7 @@
 # that passing 0 for the third argument will lead to an exception being raised
 # (see discussion in #8566)
 #
-# assert_type(pow(2, 4, 0), NoReturn)
+# assert_type(pow(2, 4, 0), Never)
 
 assert_type(pow(2, 4), int)
 # pyright infers a literal type here, but mypy does not.

stdlib/_sitebuiltins.pyi

@@ -1,12 +1,13 @@
 import sys
 from collections.abc import Iterable
-from typing import ClassVar, Literal, NoReturn
+from typing import ClassVar, Literal
+from typing_extensions import Never
 
 class Quitter:
     name: str
     eof: str
     def __init__(self, name: str, eof: str) -> None: ...
-    def __call__(self, code: sys._ExitCode = None) -> NoReturn: ...
+    def __call__(self, code: sys._ExitCode = None) -> Never: ...
 
 class _Printer:
     MAXLINES: ClassVar[Literal[23]]

stdlib/_thread.pyi

@@ -4,8 +4,8 @@ from _typeshed import structseq
 from collections.abc import Callable
 from threading import Thread
 from types import TracebackType
-from typing import Any, Final, NoReturn, final, overload
-from typing_extensions import TypeVarTuple, Unpack, deprecated, disjoint_base
+from typing import Any, Final, final, overload
+from typing_extensions import Never, TypeVarTuple, Unpack, deprecated, disjoint_base
 
 _Ts = TypeVarTuple("_Ts")
 
@@ -82,9 +82,9 @@ def start_new(function: Callable[[Unpack[_Ts]], object], args: tuple[Unpack[_Ts]
 def start_new(function: Callable[..., object], args: tuple[Any, ...], kwargs: dict[str, Any], /) -> int: ...  # undocumented
 
 def interrupt_main(signum: signal.Signals = signal.SIGINT, /) -> None: ...
-def exit() -> NoReturn: ...
+def exit() -> Never: ...
 @deprecated("Obsolete synonym. Use `exit()` instead.")
-def exit_thread() -> NoReturn: ...  # undocumented
+def exit_thread() -> Never: ...  # undocumented
 def allocate_lock() -> LockType: ...
 @deprecated("Obsolete synonym. Use `allocate_lock()` instead.")
 def allocate() -> LockType: ...  # undocumented

stdlib/_winapi.pyi

@@ -1,7 +1,8 @@
 import sys
 from _typeshed import ReadableBuffer
 from collections.abc import Sequence
-from typing import Any, Final, Literal, NoReturn, final, overload
+from typing import Any, Final, Literal, final, overload
+from typing_extensions import Never
 
 if sys.platform == "win32":
     ABOVE_NORMAL_PRIORITY_CLASS: Final = 0x8000
@@ -238,7 +239,7 @@ if sys.platform == "win32":
         options: int = 0,
         /,
     ) -> int: ...
-    def ExitProcess(ExitCode: int, /) -> NoReturn: ...
+    def ExitProcess(ExitCode: int, /) -> Never: ...
     def GetACP() -> int: ...
     if sys.version_info >= (3, 15):
         def DeregisterEventSource(handle: int, /) -> None: ...

stdlib/argparse.pyi

@@ -2,8 +2,8 @@ import sys
 from _typeshed import SupportsWrite, sentinel
 from collections.abc import Callable, Generator, Iterable, Sequence
 from re import Pattern
-from typing import IO, Any, ClassVar, Final, Generic, NoReturn, Protocol, TypeAlias, TypeVar, overload, type_check_only
-from typing_extensions import Self, deprecated
+from typing import IO, Any, ClassVar, Final, Generic, Protocol, TypeAlias, TypeVar, overload, type_check_only
+from typing_extensions import Never, Self, deprecated
 
 __all__ = [
     "ArgumentParser",
@@ -123,7 +123,7 @@ class _ActionsContainer:
     def _pop_action_class(self, kwargs: Any, default: type[Action] | None = None) -> type[Action]: ...
     def _get_handler(self) -> Callable[[Action, Iterable[tuple[str, Action]]], Any]: ...
     def _check_conflict(self, action: Action) -> None: ...
-    def _handle_conflict_error(self, action: Action, conflicting_actions: Iterable[tuple[str, Action]]) -> NoReturn: ...
+    def _handle_conflict_error(self, action: Action, conflicting_actions: Iterable[tuple[str, Action]]) -> Never: ...
     def _handle_conflict_resolve(self, action: Action, conflicting_actions: Iterable[tuple[str, Action]]) -> None: ...
 
 @type_check_only
@@ -264,8 +264,8 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
     def parse_known_args(self, *, namespace: _N) -> tuple[_N, list[str]]: ...
 
     def convert_arg_line_to_args(self, arg_line: str) -> list[str]: ...
-    def exit(self, status: int = 0, message: str | None = None) -> NoReturn: ...
-    def error(self, message: str) -> NoReturn: ...
+    def exit(self, status: int = 0, message: str | None = None) -> Never: ...
+    def error(self, message: str) -> Never: ...
 
     @overload
     def parse_intermixed_args(self, args: Iterable[str] | None = None, namespace: None = None) -> Namespace: ...

stdlib/asyncio/trsock.pyi

@@ -4,8 +4,8 @@ from _typeshed import ReadableBuffer
 from builtins import type as Type  # alias to avoid name clashes with property named "type"
 from collections.abc import Iterable
 from types import TracebackType
-from typing import Any, BinaryIO, NoReturn, TypeAlias, overload
-from typing_extensions import deprecated
+from typing import Any, BinaryIO, TypeAlias, overload
+from typing_extensions import Never, deprecated
 
 # These are based in socket, maybe move them out into _typeshed.pyi or such
 _Address: TypeAlias = socket._Address
@@ -22,7 +22,7 @@ class TransportSocket:
     def type(self) -> int: ...
     @property
     def proto(self) -> int: ...
-    def __getstate__(self) -> NoReturn: ...
+    def __getstate__(self) -> Never: ...
     def fileno(self) -> int: ...
     def dup(self) -> socket.socket: ...
     def get_inheritable(self) -> bool: ...
@@ -40,7 +40,7 @@ class TransportSocket:
 
     def getpeername(self) -> _RetAddress: ...
     def getsockname(self) -> _RetAddress: ...
-    def getsockbyname(self) -> NoReturn: ...  # This method doesn't exist on socket, yet is passed through?
+    def getsockbyname(self) -> Never: ...  # This method doesn't exist on socket, yet is passed through?
     def settimeout(self, value: float | None) -> None: ...
     def gettimeout(self) -> float | None: ...
     def setblocking(self, flag: bool) -> None: ...
@@ -60,7 +60,7 @@ class TransportSocket:
             def ioctl(self, control: int, option: int | tuple[int, int, int] | bool) -> None: ...
         else:
             @deprecated("Removed in Python 3.11")
-            def ioctl(self, control: int, option: int | tuple[int, int, int] | bool) -> NoReturn: ...
+            def ioctl(self, control: int, option: int | tuple[int, int, int] | bool) -> Never: ...
 
         @deprecated("Removed in Python 3.11")
         def listen(self, backlog: int = ..., /) -> None: ...
@@ -82,7 +82,7 @@ class TransportSocket:
             @deprecated("Removed in Python 3.11.")
             def sendmsg_afalg(
                 self, msg: Iterable[ReadableBuffer] = ..., *, op: int, iv: Any = ..., assoclen: int = ..., flags: int = 0
-            ) -> NoReturn: ...
+            ) -> Never: ...
 
         @deprecated("Removed in Python 3.11.")
         def sendmsg(
@@ -113,7 +113,7 @@ class TransportSocket:
             def share(self, process_id: int) -> bytes: ...
         else:
             @deprecated("Removed in Python 3.11.")
-            def share(self, process_id: int) -> NoReturn: ...
+            def share(self, process_id: int) -> Never: ...
 
         @deprecated("Removed in Python 3.11.")
         def recv_into(self, buffer: _WriteBuffer, nbytes: int = 0, flags: int = 0) -> int: ...

stdlib/asyncio/windows_events.pyi

@@ -2,7 +2,8 @@ import socket
 import sys
 from _typeshed import Incomplete, ReadableBuffer, WriteableBuffer
 from collections.abc import Callable
-from typing import IO, Any, ClassVar, Final, NoReturn
+from typing import IO, Any, ClassVar, Final
+from typing_extensions import Never
 
 from . import events, futures, proactor_events, selector_events, streams, windows_utils
 
@@ -105,13 +106,13 @@ if sys.platform == "win32":
     else:
         class WindowsSelectorEventLoopPolicy(events.BaseDefaultEventLoopPolicy):
             _loop_factory: ClassVar[type[SelectorEventLoop]]
-            def get_child_watcher(self) -> NoReturn: ...
-            def set_child_watcher(self, watcher: Any) -> NoReturn: ...
+            def get_child_watcher(self) -> Never: ...
+            def set_child_watcher(self, watcher: Any) -> Never: ...
 
         class WindowsProactorEventLoopPolicy(events.BaseDefaultEventLoopPolicy):
             _loop_factory: ClassVar[type[ProactorEventLoop]]
-            def get_child_watcher(self) -> NoReturn: ...
-            def set_child_watcher(self, watcher: Any) -> NoReturn: ...
+            def get_child_watcher(self) -> Never: ...
+            def set_child_watcher(self, watcher: Any) -> Never: ...
 
     if sys.version_info >= (3, 14):
         _DefaultEventLoopPolicy = _WindowsProactorEventLoopPolicy

stdlib/builtins.pyi

@@ -2112,7 +2112,7 @@ _SupportsSomeKindOfPow = (  # noqa: Y026  # TODO: Use TypeAlias once mypy bugs a
 )
 
 # TODO: `pow(int, int, Literal[0])` fails at runtime,
-# but adding a `NoReturn` overload isn't a good solution for expressing that (see #8566).
+# but adding a `Never` overload isn't a good solution for expressing that (see #8566).
 @overload
 def pow(base: int, exp: int, mod: int) -> int: ...
 @overload

stdlib/collections/__init__.pyi

@@ -14,8 +14,8 @@ from collections.abc import (
     ValuesView,
 )
 from types import GenericAlias
-from typing import Any, ClassVar, Generic, NoReturn, SupportsIndex, TypeVar, final, overload, type_check_only
-from typing_extensions import Self, disjoint_base
+from typing import Any, ClassVar, Generic, SupportsIndex, TypeVar, final, overload, type_check_only
+from typing_extensions import Never, Self, disjoint_base
 
 if sys.version_info >= (3, 15):
     from builtins import frozendict
@@ -300,7 +300,7 @@ class Counter(dict[_T, int], Generic[_T]):
     def elements(self) -> Iterator[_T]: ...
     def most_common(self, n: int | None = None) -> list[tuple[_T, int]]: ...
     @classmethod
-    def fromkeys(cls, iterable: Any, v: int | None = None) -> NoReturn: ...  # type: ignore[override]
+    def fromkeys(cls, iterable: Any, v: int | None = None) -> Never: ...  # type: ignore[override]
 
     @overload
     def subtract(self, iterable: None = None, /) -> None: ...

stdlib/datetime.pyi

@@ -1,8 +1,8 @@
 import sys
 from abc import abstractmethod
 from time import struct_time
-from typing import ClassVar, Final, NoReturn, SupportsIndex, TypeAlias, final, overload, type_check_only
-from typing_extensions import CapsuleType, Self, deprecated, disjoint_base
+from typing import ClassVar, Final, SupportsIndex, TypeAlias, final, overload, type_check_only
+from typing_extensions import CapsuleType, Never, Self, deprecated, disjoint_base
 
 if sys.version_info >= (3, 11):
     __all__ = ("date", "datetime", "time", "timedelta", "timezone", "tzinfo", "MINYEAR", "MAXYEAR", "UTC")
@@ -114,7 +114,7 @@ class date:
     def __radd__(self, value: timedelta, /) -> Self: ...
 
     @overload
-    def __sub__(self, value: datetime, /) -> NoReturn: ...
+    def __sub__(self, value: datetime, /) -> Never: ...
     @overload
     def __sub__(self, value: Self, /) -> timedelta: ...
     @overload