Sync typeshed (#22054)

Source commit:

python/typeshed@6d045a9

---------

Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
Co-authored-by: Ivan Levkivskyi <levkivskyi@gmail.com>
Co-authored-by: hauntsaninja <hauntsaninja@gmail.com>
Co-authored-by: AlexWaygood <alex.waygood@gmail.com>

Author: 5 people

misc/typeshed_patches/0001-Revert-operator-changes.patch

@@ -1,19 +1,20 @@
-From 5ab958030bd7d4ed9cb3e2afa656b68ea5a07901 Mon Sep 17 00:00:00 2001
+From aedc9789b31650f3564d1c4ca6003d3c1b2c02af Mon Sep 17 00:00:00 2001
 From: hauntsaninja <hauntsaninja@gmail.com>
 Date: Wed, 6 May 2026 19:49:41 -0700
 Subject: [PATCH] Revert operator changes
 
 ---
- mypy/typeshed/stdlib/_operator.pyi | 58 ++++++++----------------------
- 1 file changed, 14 insertions(+), 44 deletions(-)
+ mypy/typeshed/stdlib/_operator.pyi | 59 +++++++-----------------------
+ 1 file changed, 14 insertions(+), 45 deletions(-)
 
 diff --git a/mypy/typeshed/stdlib/_operator.pyi b/mypy/typeshed/stdlib/_operator.pyi
-index 04dae79dc..29a6d7057 100644
+index 565bb4169..ff419842e 100644
 --- a/mypy/typeshed/stdlib/_operator.pyi
 +++ b/mypy/typeshed/stdlib/_operator.pyi
-@@ -1,15 +1,5 @@
+@@ -1,16 +1,5 @@
  import sys
 -from _typeshed import (
+-    ReadableBuffer,
 -    SupportsAdd,
 -    SupportsGetItem,
 -    SupportsMod,
@@ -24,19 +25,19 @@ index 04dae79dc..29a6d7057 100644
 -    SupportsRSub,
 -    SupportsSub,
 -)
-+from _typeshed import SupportsGetItem
++from _typeshed import ReadableBuffer, SupportsGetItem
  from collections.abc import Callable, Container, Iterable, MutableMapping, MutableSequence, Sequence
  from operator import attrgetter as attrgetter, itemgetter as itemgetter, methodcaller as methodcaller
- from typing import Any, AnyStr, ParamSpec, Protocol, SupportsAbs, SupportsIndex, TypeAlias, TypeVar, overload, type_check_only
-@@ -18,7 +8,6 @@ from typing_extensions import TypeIs
+ from typing import Any, ParamSpec, Protocol, SupportsAbs, SupportsIndex, TypeAlias, TypeVar, overload, type_check_only
+@@ -19,7 +8,6 @@ from typing_extensions import TypeIs
  _R = TypeVar("_R")
  _T = TypeVar("_T")
  _T_co = TypeVar("_T_co", covariant=True)
 -_T_contra = TypeVar("_T_contra", contravariant=True)
  _K = TypeVar("_K")
  _V = TypeVar("_V")
  _P = ParamSpec("_P")
-@@ -69,43 +58,24 @@ def truth(a: object, /) -> bool: ...
+@@ -70,43 +58,24 @@ def truth(a: object, /) -> bool: ...
  def is_(a: object, b: object, /) -> bool: ...
  def is_not(a: object, b: object, /) -> bool: ...
  def abs(a: SupportsAbs[_T], /) -> _T: ...
@@ -94,5 +95,5 @@ index 04dae79dc..29a6d7057 100644
  def contains(a: Container[object], b: object, /) -> bool: ...
  def countOf(a: Iterable[object], b: object, /) -> int: ...
 -- 
-2.54.0
+2.46.0.dropbox.17
 

mypy/typeshed/stdlib/_codecs.pyi

@@ -1,6 +1,6 @@
 import codecs
 import sys
-from _typeshed import ReadableBuffer
+from _typeshed import ReadableBuffer, SupportsGetItem
 from collections.abc import Callable
 from typing import Literal, TypeAlias, final, overload, type_check_only
 
@@ -11,7 +11,8 @@ from typing import Literal, TypeAlias, final, overload, type_check_only
 class _EncodingMap:
     def size(self) -> int: ...
 
-_CharMap: TypeAlias = dict[int, int] | _EncodingMap
+_DecodeCharMap: TypeAlias = SupportsGetItem[int, str | int | None]
+_EncodeCharMap: TypeAlias = SupportsGetItem[int, bytes | int | None] | _EncodingMap
 _Handler: TypeAlias = Callable[[UnicodeError], tuple[str | bytes, int]]
 _SearchFunction: TypeAlias = Callable[[str], codecs.CodecInfo | None]
 
@@ -70,11 +71,13 @@ def decode(obj: str, encoding: Literal["hex", "hex_codec"], errors: str = "stric
 def decode(obj: ReadableBuffer, encoding: str = "utf-8", errors: str = "strict") -> str: ...
 
 def lookup(encoding: str, /) -> codecs.CodecInfo: ...
-def charmap_build(map: str, /) -> _CharMap: ...
+def charmap_build(map: str, /) -> dict[int, int] | _EncodingMap: ...
 def ascii_decode(data: ReadableBuffer, errors: str | None = None, /) -> tuple[str, int]: ...
 def ascii_encode(str: str, errors: str | None = None, /) -> tuple[bytes, int]: ...
-def charmap_decode(data: ReadableBuffer, errors: str | None = None, mapping: _CharMap | None = None, /) -> tuple[str, int]: ...
-def charmap_encode(str: str, errors: str | None = None, mapping: _CharMap | None = None, /) -> tuple[bytes, int]: ...
+def charmap_decode(
+    data: ReadableBuffer, errors: str | None = None, mapping: _DecodeCharMap | None = None, /
+) -> tuple[str, int]: ...
+def charmap_encode(str: str, errors: str | None = None, mapping: _EncodeCharMap | None = None, /) -> tuple[bytes, int]: ...
 
 # Docs say this accepts a bytes-like object, but in practice it also accepts str.
 def escape_decode(data: str | ReadableBuffer, errors: str | None = None, /) -> tuple[bytes, int]: ...

mypy/typeshed/stdlib/_frozen_importlib.pyi

@@ -16,6 +16,8 @@ def __import__(
     fromlist: Sequence[str] | None = (),
     level: int = 0,
 ) -> ModuleType: ...
+
+# TODO: Revise the protocol for 'loader' param
 def spec_from_loader(
     name: str, loader: LoaderProtocol | None, *, origin: str | None = None, is_package: bool | None = None
 ) -> importlib.machinery.ModuleSpec | None: ...
@@ -61,11 +63,13 @@ class BuiltinImporter(importlib.abc.MetaPathFinder, importlib.abc.InspectLoader)
     @classmethod
     def is_package(cls, fullname: str) -> bool: ...
     @classmethod
-    def load_module(cls, fullname: str) -> types.ModuleType: ...
-    @classmethod
     def get_code(cls, fullname: str) -> None: ...
     @classmethod
     def get_source(cls, fullname: str) -> None: ...
+    if sys.version_info < (3, 15):
+        @classmethod
+        @deprecated("Deprecated since Python 3.10; removed in Python 3.15. Use `exec_module()` instead.")
+        def load_module(cls, fullname: str) -> types.ModuleType: ...
     # Loader
     if sys.version_info < (3, 12):
         @staticmethod
@@ -95,11 +99,13 @@ class FrozenImporter(importlib.abc.MetaPathFinder, importlib.abc.InspectLoader):
     @classmethod
     def is_package(cls, fullname: str) -> bool: ...
     @classmethod
-    def load_module(cls, fullname: str) -> types.ModuleType: ...
-    @classmethod
     def get_code(cls, fullname: str) -> None: ...
     @classmethod
     def get_source(cls, fullname: str) -> None: ...
+    if sys.version_info < (3, 15):
+        @classmethod
+        @deprecated("Deprecated since Python 3.10; removed in Python 3.15. Use `exec_module()` instead.")
+        def load_module(cls, fullname: str) -> types.ModuleType: ...
     # Loader
     if sys.version_info < (3, 12):
         @staticmethod

mypy/typeshed/stdlib/_frozen_importlib_external.pyi

@@ -6,7 +6,7 @@ import sys
 import types
 from _typeshed import ReadableBuffer, StrOrBytesPath, StrPath
 from _typeshed.importlib import LoaderProtocol
-from collections.abc import Callable, Iterable, Mapping, MutableSequence, Sequence
+from collections.abc import Callable, Iterable, Iterator, Mapping, MutableSequence, Sequence
 from importlib.machinery import ModuleSpec
 from importlib.metadata import DistributionFinder, PathDistribution
 from typing import Any, Final, Literal, overload
@@ -23,13 +23,17 @@ else:
 
 MAGIC_NUMBER: Final[bytes]
 
-@overload
-@deprecated(
-    "The `debug_override` parameter is deprecated since Python 3.5; will be removed in Python 3.15. Use `optimization` instead."
-)
-def cache_from_source(path: StrPath, debug_override: bool, *, optimization: None = None) -> str: ...
-@overload
-def cache_from_source(path: StrPath, debug_override: None = None, *, optimization: Any | None = None) -> str: ...
+if sys.version_info >= (3, 15):
+    def cache_from_source(path: StrPath, *, optimization: Any | None = None) -> str: ...
+
+else:
+    @overload
+    @deprecated(
+        "The `debug_override` parameter is deprecated since Python 3.5; removed in Python 3.15. Use `optimization` instead."
+    )
+    def cache_from_source(path: StrPath, debug_override: bool, *, optimization: None = None) -> str: ...
+    @overload
+    def cache_from_source(path: StrPath, debug_override: None = None, *, optimization: Any | None = None) -> str: ...
 
 def source_from_cache(path: StrPath) -> str: ...
 def decode_source(source_bytes: ReadableBuffer) -> str: ...
@@ -70,6 +74,10 @@ class PathFinder(importlib.abc.MetaPathFinder):
         @deprecated("Deprecated since Python 3.4; removed in Python 3.12. Use `find_spec()` instead.")
         def find_module(cls, fullname: str, path: Sequence[str] | None = None) -> importlib.abc.Loader | None: ...
 
+    if sys.version_info >= (3, 15):
+        @classmethod
+        def discover(cls, parent: ModuleSpec | None = None) -> Iterator[ModuleSpec]: ...
+
 SOURCE_SUFFIXES: Final[list[str]]
 DEBUG_BYTECODE_SUFFIXES: Final = [".pyc"]
 OPTIMIZED_BYTECODE_SUFFIXES: Final = [".pyc"]
@@ -84,20 +92,40 @@ class FileFinder(importlib.abc.PathEntryFinder):
         cls, *loader_details: tuple[type[importlib.abc.Loader], list[str]]
     ) -> Callable[[str], importlib.abc.PathEntryFinder]: ...
 
+    if sys.version_info >= (3, 15):
+        def discover(self, parent: ModuleSpec | None = None) -> Iterator[ModuleSpec]: ...
+
 class _LoaderBasics:
     def is_package(self, fullname: str) -> bool: ...
     def create_module(self, spec: ModuleSpec) -> types.ModuleType | None: ...
     def exec_module(self, module: types.ModuleType) -> None: ...
-    def load_module(self, fullname: str) -> types.ModuleType: ...
+    if sys.version_info < (3, 15):
+        @deprecated("Deprecated since Python 3.10; removed in Python 3.15. Use `exec_module()` instead.")
+        def load_module(self, fullname: str) -> types.ModuleType: ...
 
 class SourceLoader(_LoaderBasics):
     def path_mtime(self, path: str) -> float: ...
     def set_data(self, path: str, data: bytes) -> None: ...
     def get_source(self, fullname: str) -> str | None: ...
     def path_stats(self, path: str) -> Mapping[str, Any]: ...
-    def source_to_code(
-        self, data: ReadableBuffer | str | _ast.Module | _ast.Expression | _ast.Interactive, path: bytes | StrPath
-    ) -> types.CodeType: ...
+    if sys.version_info >= (3, 15):
+        def source_to_code(
+            self,
+            data: ReadableBuffer | str | _ast.Module | _ast.Expression | _ast.Interactive,
+            path: bytes | StrPath,
+            fullname: str | None = None,
+            *,
+            _optimize: int = -1,
+        ) -> types.CodeType: ...
+    else:
+        def source_to_code(
+            self,
+            data: ReadableBuffer | str | _ast.Module | _ast.Expression | _ast.Interactive,
+            path: bytes | StrPath,
+            *,
+            _optimize: int = -1,
+        ) -> types.CodeType: ...
+
     def get_code(self, fullname: str) -> types.CodeType | None: ...
 
 class FileLoader:
@@ -106,19 +134,14 @@ class FileLoader:
     def __init__(self, fullname: str, path: str) -> None: ...
     def get_data(self, path: str) -> bytes: ...
     def get_filename(self, fullname: str | None = None) -> str: ...
-    def load_module(self, fullname: str | None = None) -> types.ModuleType: ...
     def get_resource_reader(self, name: str | None = None) -> importlib.readers.FileReader: ...
+    if sys.version_info < (3, 15):
+        @deprecated("Deprecated since Python 3.10; removed in Python 3.15. Use `exec_module()` instead.")
+        def load_module(self, fullname: str | None = None) -> types.ModuleType: ...
 
 class SourceFileLoader(importlib.abc.FileLoader, FileLoader, importlib.abc.SourceLoader, SourceLoader):  # type: ignore[misc]  # incompatible method arguments in base classes
     def set_data(self, path: str, data: ReadableBuffer, *, _mode: int = 0o666) -> None: ...
     def path_stats(self, path: str) -> Mapping[str, Any]: ...
-    def source_to_code(  # type: ignore[override]  # incompatible with InspectLoader.source_to_code
-        self,
-        data: ReadableBuffer | str | _ast.Module | _ast.Expression | _ast.Interactive,
-        path: bytes | StrPath,
-        *,
-        _optimize: int = -1,
-    ) -> types.CodeType: ...
 
 class SourcelessFileLoader(importlib.abc.FileLoader, FileLoader, _LoaderBasics):
     def get_code(self, fullname: str) -> types.CodeType | None: ...
@@ -134,19 +157,34 @@ class ExtensionFileLoader(FileLoader, _LoaderBasics, importlib.abc.ExecutionLoad
     def __eq__(self, other: object) -> bool: ...
     def __hash__(self) -> int: ...
 
+if sys.version_info >= (3, 15):
+    class NamespacePath:
+        def __init__(
+            self, name: str, path: MutableSequence[str], path_finder: Callable[[str, tuple[str, ...]], ModuleSpec | None]
+        ) -> None: ...
+        def __iter__(self) -> Iterator[str]: ...
+        def __getitem__(self, index: int) -> str: ...
+        def __setitem__(self, index: int, path: str) -> None: ...
+        def __len__(self) -> int: ...
+        def __contains__(self, item: str) -> bool: ...
+        def append(self, item: str) -> None: ...
+
+    _NamespacePath = NamespacePath
+
 if sys.version_info >= (3, 11):
     class NamespaceLoader(importlib.abc.InspectLoader):
         def __init__(
-            self, name: str, path: MutableSequence[str], path_finder: Callable[[str, tuple[str, ...]], ModuleSpec]
+            self, name: str, path: MutableSequence[str], path_finder: Callable[[str, tuple[str, ...]], ModuleSpec | None]
         ) -> None: ...
         def is_package(self, fullname: str) -> Literal[True]: ...
         def get_source(self, fullname: str) -> Literal[""]: ...
         def get_code(self, fullname: str) -> types.CodeType: ...
         def create_module(self, spec: ModuleSpec) -> None: ...
         def exec_module(self, module: types.ModuleType) -> None: ...
-        @deprecated("Deprecated since Python 3.10; will be removed in Python 3.15. Use `exec_module()` instead.")
-        def load_module(self, fullname: str) -> types.ModuleType: ...
         def get_resource_reader(self, module: types.ModuleType) -> importlib.readers.NamespaceReader: ...
+        if sys.version_info < (3, 15):
+            @deprecated("Deprecated since Python 3.10; removed in Python 3.15. Use `exec_module()` instead.")
+            def load_module(self, fullname: str) -> types.ModuleType: ...
         if sys.version_info < (3, 12):
             @staticmethod
             @deprecated(
@@ -159,14 +197,14 @@ if sys.version_info >= (3, 11):
 else:
     class _NamespaceLoader:
         def __init__(
-            self, name: str, path: MutableSequence[str], path_finder: Callable[[str, tuple[str, ...]], ModuleSpec]
+            self, name: str, path: MutableSequence[str], path_finder: Callable[[str, tuple[str, ...]], ModuleSpec | None]
         ) -> None: ...
         def is_package(self, fullname: str) -> Literal[True]: ...
         def get_source(self, fullname: str) -> Literal[""]: ...
         def get_code(self, fullname: str) -> types.CodeType: ...
         def create_module(self, spec: ModuleSpec) -> None: ...
         def exec_module(self, module: types.ModuleType) -> None: ...
-        @deprecated("Deprecated since Python 3.10; will be removed in Python 3.15. Use `exec_module()` instead.")
+        @deprecated("Deprecated since Python 3.10; removed in Python 3.15. Use `exec_module()` instead.")
         def load_module(self, fullname: str) -> types.ModuleType: ...
         @staticmethod
         @deprecated(

mypy/typeshed/stdlib/_interpreters.pyi

@@ -1,3 +1,4 @@
+import sys
 import types
 from collections.abc import Callable
 from typing import Any, Final, Literal, SupportsIndex, TypeAlias, TypeVar, overload
@@ -10,7 +11,12 @@ _SharedDict: TypeAlias = dict[str, Any]  # many objects can be shared
 
 class InterpreterError(Exception): ...
 class InterpreterNotFoundError(InterpreterError): ...
-class NotShareableError(ValueError): ...
+
+if sys.version_info >= (3, 14):
+    class NotShareableError(TypeError): ...
+
+else:
+    class NotShareableError(ValueError): ...
 
 @disjoint_base
 class CrossInterpreterBufferView:

mypy/typeshed/stdlib/_operator.pyi

@@ -1,8 +1,8 @@
 import sys
-from _typeshed import SupportsGetItem
+from _typeshed import ReadableBuffer, SupportsGetItem
 from collections.abc import Callable, Container, Iterable, MutableMapping, MutableSequence, Sequence
 from operator import attrgetter as attrgetter, itemgetter as itemgetter, methodcaller as methodcaller
-from typing import Any, AnyStr, ParamSpec, Protocol, SupportsAbs, SupportsIndex, TypeAlias, TypeVar, overload, type_check_only
+from typing import Any, ParamSpec, Protocol, SupportsAbs, SupportsIndex, TypeAlias, TypeVar, overload, type_check_only
 from typing_extensions import TypeIs
 
 _R = TypeVar("_R")
@@ -120,7 +120,10 @@ def ixor(a, b, /): ...
 if sys.version_info >= (3, 11):
     def call(obj: Callable[_P, _R], /, *args: _P.args, **kwargs: _P.kwargs) -> _R: ...
 
-def _compare_digest(a: AnyStr, b: AnyStr, /) -> bool: ...
+@overload
+def _compare_digest(a: ReadableBuffer, b: ReadableBuffer, /) -> bool: ...
+@overload
+def _compare_digest(a: str, b: str, /) -> bool: ...
 
 if sys.version_info >= (3, 14):
     def is_none(a: object, /) -> TypeIs[None]: ...

mypy/typeshed/stdlib/_remote_debugging.pyi

@@ -157,6 +157,9 @@ class BinaryWriter:
     @property
     def total_samples(self) -> int: ...
     def write_sample(self, stack_frames: list[InterpreterInfo], timestamp_us: int) -> None: ...
+    def set_stats(
+        self, /, duration_sec: float, sample_rate: float, error_rate: float | None = None, missed_samples: float | None = None
+    ) -> None: ...
     def finalize(self) -> None: ...
     def close(self) -> None: ...
     def __enter__(self) -> Self: ...

mypy/typeshed/stdlib/_socket.pyi

@@ -693,7 +693,7 @@ if sys.platform != "darwin":
     BDADDR_ANY: Final = "00:00:00:00:00:00"
     BDADDR_LOCAL: Final = "00:00:00:FF:FF:FF"
 
-if sys.platform != "win32" and sys.platform != "darwin" and sys.platform != "linux":
+if sys.platform != "win32" and sys.platform != "darwin":
     HCI_FILTER: Final[int]  # not in NetBSD or DragonFlyBSD
     HCI_TIME_STAMP: Final[int]  # not in FreeBSD, NetBSD, or DragonFlyBSD
     HCI_DATA_DIR: Final[int]  # not in FreeBSD, NetBSD, or DragonFlyBSD

mypy/typeshed/stdlib/_struct.pyi

@@ -3,8 +3,8 @@ from collections.abc import Iterator
 from typing import Any
 from typing_extensions import disjoint_base
 
-def pack(fmt: str | bytes, /, *v: Any) -> bytes: ...
-def pack_into(fmt: str | bytes, buffer: WriteableBuffer, offset: int, /, *v: Any) -> None: ...
+def pack(format: str | bytes, /, *values: Any) -> bytes: ...
+def pack_into(format: str | bytes, buffer: WriteableBuffer, offset: int, /, *values: Any) -> None: ...
 def unpack(format: str | bytes, buffer: ReadableBuffer, /) -> tuple[Any, ...]: ...
 def unpack_from(format: str | bytes, /, buffer: ReadableBuffer, offset: int = 0) -> tuple[Any, ...]: ...
 def iter_unpack(format: str | bytes, buffer: ReadableBuffer, /) -> Iterator[tuple[Any, ...]]: ...
@@ -17,8 +17,8 @@ class Struct:
     @property
     def size(self) -> int: ...
     def __init__(self, format: str | bytes) -> None: ...
-    def pack(self, *v: Any) -> bytes: ...
-    def pack_into(self, buffer: WriteableBuffer, offset: int, *v: Any) -> None: ...
+    def pack(self, *values: Any) -> bytes: ...
+    def pack_into(self, buffer: WriteableBuffer, offset: int, /, *values: Any) -> None: ...
     def unpack(self, buffer: ReadableBuffer, /) -> tuple[Any, ...]: ...
     def unpack_from(self, buffer: ReadableBuffer, offset: int = 0) -> tuple[Any, ...]: ...
     def iter_unpack(self, buffer: ReadableBuffer, /) -> Iterator[tuple[Any, ...]]: ...