Merge branch 'master' into fix-19304

Author: rheard

misc/typeshed_patches/0001-Partially-revert-Clean-up-argparse-hacks.patch

@@ -1,4 +1,4 @@
-From 3fa6658041d3ccd7f2a4bd725e21fa9768bf6ebc Mon Sep 17 00:00:00 2001
+From 3715a29572ebccffe78c508da15e99ab10dc15d3 Mon Sep 17 00:00:00 2001
 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
 Date: Sat, 15 Feb 2025 20:11:06 +0100
 Subject: [PATCH] Partially revert Clean up argparse hacks
@@ -8,16 +8,16 @@ Subject: [PATCH] Partially revert Clean up argparse hacks
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/mypy/typeshed/stdlib/argparse.pyi b/mypy/typeshed/stdlib/argparse.pyi
-index 22d330a08..fa22f842d 100644
+index 36ea1981a..6ee01a82d 100644
 --- a/mypy/typeshed/stdlib/argparse.pyi
 +++ b/mypy/typeshed/stdlib/argparse.pyi
 @@ -2,7 +2,7 @@ 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 import IO, Any, ClassVar, Final, Generic, NewType, 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 import IO, Any, ClassVar, Final, Generic, NewType, Protocol, TypeAlias, TypeVar, overload, type_check_only
+ from typing_extensions import Never, Self, deprecated
 
  __all__ = [
 @@ -36,7 +36,9 @@ ONE_OR_MORE: Final = "+"
@@ -41,5 +41,5 @@ index 22d330a08..fa22f842d 100644
          default: Any = ...,
          type: _ActionType = ...,
 -- 
-2.54.0
+2.55.0
 

misc/typeshed_patches/0001-Revert-Remove-redundant-inheritances-from-Iterator.patch

@@ -1,4 +1,4 @@
-From b5d1e4c76d8139e1a20f9178e8123f3ee39084d2 Mon Sep 17 00:00:00 2001
+From aedaebba6e477469af6bc21ffb60ff6fc5def01e Mon Sep 17 00:00:00 2001
 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
 Date: Sat, 21 Dec 2024 22:36:38 +0100
 Subject: [PATCH] Revert Remove redundant inheritances from Iterator in
@@ -36,10 +36,10 @@ index 242093e1e..92bb4e5f4 100644
      @property
      def _exception(self) -> BaseException | None: ...
 diff --git a/mypy/typeshed/stdlib/builtins.pyi b/mypy/typeshed/stdlib/builtins.pyi
-index e63b74214..9ea382dd6 100644
+index ec72c308e..d0963d5b7 100644
 --- a/mypy/typeshed/stdlib/builtins.pyi
 +++ b/mypy/typeshed/stdlib/builtins.pyi
-@@ -1368,7 +1368,7 @@ class frozenset(AbstractSet[_T_co]):
+@@ -1376,7 +1376,7 @@ class frozenset(AbstractSet[_T_co]):
      def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
 
  @disjoint_base
@@ -48,7 +48,7 @@ index e63b74214..9ea382dd6 100644
      def __new__(cls, iterable: Iterable[_T], start: int = 0) -> Self: ...
      def __iter__(self) -> Self: ...
      def __next__(self) -> tuple[int, _T]: ...
-@@ -1634,7 +1634,7 @@ else:
+@@ -1642,7 +1642,7 @@ else:
  exit: _sitebuiltins.Quitter
 
  @disjoint_base
@@ -57,7 +57,7 @@ index e63b74214..9ea382dd6 100644
      @overload
      def __new__(cls, function: None, iterable: Iterable[_T | None], /) -> Self: ...
      @overload
-@@ -1705,7 +1705,7 @@ license: _sitebuiltins._Printer
+@@ -1713,7 +1713,7 @@ license: _sitebuiltins._Printer
  def locals() -> dict[str, Any]: ...
 
  @disjoint_base
@@ -66,16 +66,16 @@ index e63b74214..9ea382dd6 100644
      # 3.14 adds `strict` argument.
      if sys.version_info >= (3, 14):
          @overload
-@@ -2021,7 +2021,7 @@ def pow(base: _SupportsSomeKindOfPow, exp: complex, mod: None = None) -> complex
- quit: _sitebuiltins.Quitter
+@@ -2033,7 +2033,7 @@ class _SupportsReversed(Protocol[_T_co]):
+     def __reversed__(self) -> _T_co: ...
 
  @disjoint_base
--class reversed(Generic[_T]):
-+class reversed(Iterator[_T]):
+-class reversed(Generic[_T_co]):
++class reversed(Iterator[_T_co]):
      @overload
-     def __new__(cls, sequence: Reversible[_T], /) -> Iterator[_T]: ...  # type: ignore[misc]
+     def __new__(cls, sequence: _SupportsReversed[_T], /) -> _T: ...  # type: ignore[misc]
      @overload
-@@ -2101,7 +2101,7 @@ def vars(object: type, /) -> types.MappingProxyType[str, Any]: ...
+@@ -2113,7 +2113,7 @@ def vars(object: type, /) -> types.MappingProxyType[str, Any]: ...
  def vars(object: Any = ..., /) -> dict[str, Any]: ...
 
  @disjoint_base

misc/typeshed_patches/0001-Revert-dict.__or__-typeshed-change.patch

@@ -1,4 +1,4 @@
-From 92a0169fa37f3ff1c41beb98ae0f61e3b3ff19dc Mon Sep 17 00:00:00 2001
+From f164b6f2926819cab52cca1e83b62f597d0aa82b Mon Sep 17 00:00:00 2001
 From: Ivan Levkivskyi <levkivskyi@gmail.com>
 Date: Wed, 8 Apr 2026 00:01:44 +0100
 Subject: [PATCH] Revert dict.__or__ typeshed change
@@ -8,10 +8,10 @@ Subject: [PATCH] Revert dict.__or__ typeshed change
  1 file changed, 20 insertions(+)
 
 diff --git a/mypy/typeshed/stdlib/builtins.pyi b/mypy/typeshed/stdlib/builtins.pyi
-index 9db6f4fc7..7ec0e2d7c 100644
+index d0963d5b7..532ba324d 100644
 --- a/mypy/typeshed/stdlib/builtins.pyi
 +++ b/mypy/typeshed/stdlib/builtins.pyi
-@@ -1228,14 +1228,27 @@ class dict(MutableMapping[_KT, _VT]):
+@@ -1235,15 +1235,28 @@ class dict(MutableMapping[_KT, _VT]):
      __hash__: ClassVar[None]  # type: ignore[assignment]
      def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
      if sys.version_info >= (3, 15):
@@ -28,6 +28,7 @@ index 9db6f4fc7..7ec0e2d7c 100644
 +        def __ror__(self, value: frozendict[_KT, _VT], /) -> frozendict[_KT, _VT]: ...
 +        @overload
          def __ror__(self, value: frozendict[_T1, _T2], /) -> frozendict[_KT | _T1, _VT | _T2]: ...
+ 
      else:
 +        @overload
 +        def __or__(self, value: dict[_KT, _VT], /) -> dict[_KT, _VT]: ...
@@ -39,7 +40,7 @@ index 9db6f4fc7..7ec0e2d7c 100644
          def __ror__(self, value: dict[_T1, _T2], /) -> dict[_KT | _T1, _VT | _T2]: ...
 
      # dict.__ior__ should be kept roughly in line with MutableMapping.update()
-@@ -1290,11 +1303,18 @@ if sys.version_info >= (3, 15):
+@@ -1297,11 +1310,18 @@ if sys.version_info >= (3, 15):
          def __iter__(self) -> Iterator[_KT]: ...
          def __hash__(self) -> int: ...
          def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
@@ -59,5 +60,5 @@ index 9db6f4fc7..7ec0e2d7c 100644
 
  @disjoint_base
 -- 
-2.54.0
+2.55.0
 

mypy-requirements.txt

@@ -5,5 +5,5 @@ typing_extensions>=4.14.0; python_version>='3.15'
 mypy_extensions>=1.0.0
 pathspec>=1.0.0
 tomli>=1.1.0; python_version<'3.11'
-librt>=0.13.0; platform_python_implementation != 'PyPy'
-ast-serialize>=0.6.0,<1.0.0
+librt>=0.14.0; platform_python_implementation != 'PyPy'
+ast-serialize>=0.7.0,<1.0.0

mypy/typeshed/stdlib/__main__.pyi

@@ -1 +1 @@
-def __getattr__(name: str): ...  # incomplete module
+def __getattr__(name: str, /): ...  # incomplete module

mypy/typeshed/stdlib/_ctypes.pyi

@@ -249,7 +249,7 @@ class _UnionType(_CTypeBaseType):
     # At runtime, various attributes are created on a Union subclass based
     # on its _fields_. This method doesn't exist, but represents those
     # dynamically created attributes.
-    def __getattr__(self, name: str) -> _CField[Any, Any, Any]: ...
+    def __getattr__(self, name: str, /) -> _CField[Any, Any, Any]: ...
     if sys.version_info < (3, 13):
         # Inherited from CType_Type starting on 3.13
         def __mul__(cls: type[_CT], other: int) -> type[Array[_CT]]: ...  # type: ignore[misc] # pyright: ignore[reportGeneralTypeIssues]
@@ -263,8 +263,8 @@ class Union(_CData, metaclass=_UnionType):
         _align_: ClassVar[int]
 
     def __init__(self, *args: Any, **kw: Any) -> None: ...
-    def __getattr__(self, name: str) -> Any: ...
-    def __setattr__(self, name: str, value: Any) -> None: ...
+    def __getattr__(self, name: str, /) -> Any: ...
+    def __setattr__(self, name: str, value: Any, /) -> None: ...
 
 # This class is not exposed. It calls itself _ctypes.PyCStructType.
 @type_check_only
@@ -277,7 +277,7 @@ class _PyCStructType(_CTypeBaseType):
     # At runtime, various attributes are created on a Structure subclass based
     # on its _fields_. This method doesn't exist, but represents those
     # dynamically created attributes.
-    def __getattr__(self, name: str) -> _CField[Any, Any, Any]: ...
+    def __getattr__(self, name: str, /) -> _CField[Any, Any, Any]: ...
     if sys.version_info < (3, 13):
         # Inherited from CType_Type starting on 3.13
         def __mul__(cls: type[_CT], other: int) -> type[Array[_CT]]: ...  # type: ignore[misc] # pyright: ignore[reportGeneralTypeIssues]
@@ -295,7 +295,7 @@ class Structure(_CData, metaclass=_PyCStructType):
         _layout_: ClassVar[Literal["ms", "gcc-sysv"]]
 
     def __init__(self, *args: Any, **kw: Any) -> None: ...
-    def __getattr__(self, name: str) -> Any: ...
+    def __getattr__(self, name: str, /) -> Any: ...
     def __setattr__(self, name: str, value: Any) -> None: ...
 
 # This class is not exposed. It calls itself _ctypes.PyCArrayType.

mypy/typeshed/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]]

mypy/typeshed/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

mypy/typeshed/stdlib/_typeshed/__init__.pyi

@@ -58,6 +58,14 @@ Unused: TypeAlias = object  # stable
 # for more information.
 MaybeNone: TypeAlias = Any  # stable
 
+# typeshed-internal type aliases to facilitate transition from
+# `float` to either `float | int` or `float` (and similar for `complex`).
+# When you encounter one of these type aliases, you are encouraged to
+# replace them with the correct type. Please don't use them outside typeshed.
+# See https://github.com/python/typeshed/issues/16059 for details.
+FloatInt: TypeAlias = float | int
+ComplexInt: TypeAlias = complex | float | int
+
 # Used to mark arguments that default to a sentinel value. This prevents
 # stubtest from complaining about the default value not matching.
 #

mypy/typeshed/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: ...
@@ -312,3 +313,6 @@ if sys.platform == "win32":
     if sys.version_info >= (3, 12):
         def CopyFile2(existing_file_name: str, new_file_name: str, flags: int, progress_routine: int | None = None) -> int: ...
         def NeedCurrentDirectoryForExePath(exe_name: str, /) -> bool: ...
+
+    if sys.version_info >= (3, 15):
+        def GetTickCount64() -> int: ...