Sync typeshed (#16493)

Source commit:

python/typeshed@643d911

mypy/typeshed/stdlib/_ast.pyi

@@ -553,7 +553,7 @@ if sys.version_info >= (3, 10):
 
     class MatchSingleton(pattern):
         __match_args__ = ("value",)
-        value: Literal[True, False, None]
+        value: Literal[True, False] | None
 
     class MatchSequence(pattern):
         __match_args__ = ("patterns",)

mypy/typeshed/stdlib/_locale.pyi

@@ -1,6 +1,6 @@
 import sys
 from _typeshed import StrPath
-from collections.abc import Iterable, Mapping
+from collections.abc import Mapping
 
 LC_CTYPE: int
 LC_COLLATE: int
@@ -10,7 +10,7 @@ LC_NUMERIC: int
 LC_ALL: int
 CHAR_MAX: int
 
-def setlocale(category: int, locale: str | Iterable[str | None] | None = None) -> str: ...
+def setlocale(__category: int, __locale: str | None = None) -> str: ...
 def localeconv() -> Mapping[str, int | str | list[int]]: ...
 
 if sys.version_info >= (3, 11):

mypy/typeshed/stdlib/_typeshed/__init__.pyi

@@ -236,6 +236,10 @@ class SupportsNoArgReadline(Protocol[_T_co]):
 class SupportsWrite(Protocol[_T_contra]):
     def write(self, __s: _T_contra) -> object: ...
 
+# stable
+class SupportsFlush(Protocol):
+    def flush(self) -> object: ...
+
 # Unfortunately PEP 688 does not allow us to distinguish read-only
 # from writable buffers. We use these aliases for readability for now.
 # Perhaps a future extension of the buffer protocol will allow us to

mypy/typeshed/stdlib/_typeshed/wsgi.pyi

@@ -11,7 +11,7 @@ from typing import Any, Protocol
 from typing_extensions import TypeAlias
 
 class _Readable(Protocol):
-    def read(self, size: int = ...) -> bytes: ...
+    def read(self, __size: int = ...) -> bytes: ...
     # Optional: def close(self) -> object: ...
 
 if sys.version_info >= (3, 11):

mypy/typeshed/stdlib/_typeshed/xml.pyi

@@ -4,6 +4,6 @@ from typing import Any, Protocol
 
 # As defined https://docs.python.org/3/library/xml.dom.html#domimplementation-objects
 class DOMImplementation(Protocol):
-    def hasFeature(self, feature: str, version: str | None) -> bool: ...
-    def createDocument(self, namespaceUri: str, qualifiedName: str, doctype: Any | None) -> Any: ...
-    def createDocumentType(self, qualifiedName: str, publicId: str, systemId: str) -> Any: ...
+    def hasFeature(self, __feature: str, __version: str | None) -> bool: ...
+    def createDocument(self, __namespaceUri: str, __qualifiedName: str, __doctype: Any | None) -> Any: ...
+    def createDocumentType(self, __qualifiedName: str, __publicId: str, __systemId: str) -> Any: ...

mypy/typeshed/stdlib/_warnings.pyi

@@ -1,13 +1,36 @@
+import sys
 from typing import Any, overload
 
 _defaultaction: str
 _onceregistry: dict[Any, Any]
 filters: list[tuple[str, str | None, type[Warning], str | None, int]]
 
-@overload
-def warn(message: str, category: type[Warning] | None = None, stacklevel: int = 1, source: Any | None = None) -> None: ...
-@overload
-def warn(message: Warning, category: Any = None, stacklevel: int = 1, source: Any | None = None) -> None: ...
+if sys.version_info >= (3, 12):
+    @overload
+    def warn(
+        message: str,
+        category: type[Warning] | None = None,
+        stacklevel: int = 1,
+        source: Any | None = None,
+        *,
+        skip_file_prefixes: tuple[str, ...] = (),
+    ) -> None: ...
+    @overload
+    def warn(
+        message: Warning,
+        category: Any = None,
+        stacklevel: int = 1,
+        source: Any | None = None,
+        *,
+        skip_file_prefixes: tuple[str, ...] = (),
+    ) -> None: ...
+
+else:
+    @overload
+    def warn(message: str, category: type[Warning] | None = None, stacklevel: int = 1, source: Any | None = None) -> None: ...
+    @overload
+    def warn(message: Warning, category: Any = None, stacklevel: int = 1, source: Any | None = None) -> None: ...
+
 @overload
 def warn_explicit(
     message: str,

mypy/typeshed/stdlib/argparse.pyi

@@ -120,7 +120,7 @@ class _ActionsContainer:
     def _handle_conflict_resolve(self, action: Action, conflicting_actions: Iterable[tuple[str, Action]]) -> None: ...
 
 class _FormatterClass(Protocol):
-    def __call__(self, prog: str) -> HelpFormatter: ...
+    def __call__(self, *, prog: str) -> HelpFormatter: ...
 
 class ArgumentParser(_AttributeHolder, _ActionsContainer):
     prog: str

mypy/typeshed/stdlib/ast.pyi

@@ -4,27 +4,30 @@ from _ast import *
 from _typeshed import ReadableBuffer, Unused
 from collections.abc import Iterator
 from typing import Any, TypeVar as _TypeVar, overload
-from typing_extensions import Literal
+from typing_extensions import Literal, deprecated
 
 if sys.version_info >= (3, 8):
     class _ABC(type):
         if sys.version_info >= (3, 9):
             def __init__(cls, *args: Unused) -> None: ...
 
+    @deprecated("Replaced by ast.Constant; removal scheduled for Python 3.14")
     class Num(Constant, metaclass=_ABC):
         value: int | float | complex
-
+    @deprecated("Replaced by ast.Constant; removal scheduled for Python 3.14")
     class Str(Constant, metaclass=_ABC):
         value: str
         # Aliases for value, for backwards compatibility
         s: str
-
+    @deprecated("Replaced by ast.Constant; removal scheduled for Python 3.14")
     class Bytes(Constant, metaclass=_ABC):
         value: bytes
         # Aliases for value, for backwards compatibility
         s: bytes
-
+    @deprecated("Replaced by ast.Constant; removal scheduled for Python 3.14")
     class NameConstant(Constant, metaclass=_ABC): ...
+
+    @deprecated("Replaced by ast.Constant; removal scheduled for Python 3.14")
     class Ellipsis(Constant, metaclass=_ABC): ...
 
 if sys.version_info >= (3, 9):

mypy/typeshed/stdlib/asyncio/base_events.pyi

@@ -423,7 +423,7 @@ class BaseEventLoop(AbstractEventLoop):
         bufsize: Literal[0] = 0,
         encoding: None = None,
         errors: None = None,
-        text: Literal[False, None] = None,
+        text: Literal[False] | None = None,
         **kwargs: Any,
     ) -> tuple[SubprocessTransport, _ProtocolT]: ...
     async def subprocess_exec(

mypy/typeshed/stdlib/asyncio/events.pyi

@@ -522,7 +522,7 @@ class AbstractEventLoop:
         bufsize: Literal[0] = 0,
         encoding: None = None,
         errors: None = None,
-        text: Literal[False, None] = ...,
+        text: Literal[False] | None = ...,
         **kwargs: Any,
     ) -> tuple[SubprocessTransport, _ProtocolT]: ...
     @abstractmethod

mypy/typeshed/stdlib/asyncio/proactor_events.pyi

@@ -1,19 +1,13 @@
 import sys
 from collections.abc import Mapping
 from socket import socket
-from typing import Any, ClassVar, Protocol
+from typing import Any, ClassVar
 from typing_extensions import Literal
 
 from . import base_events, constants, events, futures, streams, transports
 
 __all__ = ("BaseProactorEventLoop",)
 
-if sys.version_info >= (3, 8):
-    class _WarnCallbackProtocol(Protocol):
-        def __call__(
-            self, message: str, category: type[Warning] | None = ..., stacklevel: int = ..., source: Any | None = ...
-        ) -> object: ...
-
 class _ProactorBasePipeTransport(transports._FlowControlMixin, transports.BaseTransport):
     def __init__(
         self,
@@ -24,10 +18,7 @@ class _ProactorBasePipeTransport(transports._FlowControlMixin, transports.BaseTr
         extra: Mapping[Any, Any] | None = None,
         server: events.AbstractServer | None = None,
     ) -> None: ...
-    if sys.version_info >= (3, 8):
-        def __del__(self, _warn: _WarnCallbackProtocol = ...) -> None: ...
-    else:
-        def __del__(self) -> None: ...
+    def __del__(self) -> None: ...
 
 class _ProactorReadPipeTransport(_ProactorBasePipeTransport, transports.ReadTransport):
     if sys.version_info >= (3, 10):

mypy/typeshed/stdlib/asyncio/subprocess.pyi

@@ -54,7 +54,7 @@ if sys.version_info >= (3, 11):
         bufsize: Literal[0] = 0,
         encoding: None = None,
         errors: None = None,
-        text: Literal[False, None] = None,
+        text: Literal[False] | None = None,
         # These parameters are taken by subprocess.Popen, which this ultimately delegates to
         executable: StrOrBytesPath | None = None,
         preexec_fn: Callable[[], Any] | None = None,
@@ -120,7 +120,7 @@ elif sys.version_info >= (3, 10):
         bufsize: Literal[0] = 0,
         encoding: None = None,
         errors: None = None,
-        text: Literal[False, None] = None,
+        text: Literal[False] | None = None,
         # These parameters are taken by subprocess.Popen, which this ultimately delegates to
         executable: StrOrBytesPath | None = None,
         preexec_fn: Callable[[], Any] | None = None,
@@ -185,7 +185,7 @@ else:  # >= 3.9
         bufsize: Literal[0] = 0,
         encoding: None = None,
         errors: None = None,
-        text: Literal[False, None] = None,
+        text: Literal[False] | None = None,
         # These parameters are taken by subprocess.Popen, which this ultimately delegates to
         executable: StrOrBytesPath | None = None,
         preexec_fn: Callable[[], Any] | None = None,

mypy/typeshed/stdlib/asyncio/unix_events.pyi

@@ -84,13 +84,6 @@ if sys.platform != "win32":
     DefaultEventLoopPolicy = _UnixDefaultEventLoopPolicy
 
     if sys.version_info >= (3, 8):
-        from typing import Protocol
-
-        class _Warn(Protocol):
-            def __call__(
-                self, message: str, category: type[Warning] | None = ..., stacklevel: int = ..., source: Any | None = ...
-            ) -> object: ...
-
         class MultiLoopChildWatcher(AbstractChildWatcher):
             def is_active(self) -> bool: ...
             def close(self) -> None: ...
@@ -109,7 +102,7 @@ if sys.platform != "win32":
             def __exit__(
                 self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: types.TracebackType | None
             ) -> None: ...
-            def __del__(self, _warn: _Warn = ...) -> None: ...
+            def __del__(self) -> None: ...
             def add_child_handler(self, pid: int, callback: Callable[..., object], *args: Any) -> None: ...
             def remove_child_handler(self, pid: int) -> bool: ...
             def attach_loop(self, loop: AbstractEventLoop | None) -> None: ...

mypy/typeshed/stdlib/asyncio/windows_utils.pyi

@@ -2,28 +2,20 @@ import subprocess
 import sys
 from collections.abc import Callable
 from types import TracebackType
-from typing import Any, AnyStr, Protocol
+from typing import Any, AnyStr
 from typing_extensions import Literal, Self
 
 if sys.platform == "win32":
     __all__ = ("pipe", "Popen", "PIPE", "PipeHandle")
 
-    class _WarnFunction(Protocol):
-        def __call__(
-            self, message: str, category: type[Warning] = ..., stacklevel: int = ..., source: PipeHandle = ...
-        ) -> object: ...
     BUFSIZE: Literal[8192]
     PIPE = subprocess.PIPE
     STDOUT = subprocess.STDOUT
     def pipe(*, duplex: bool = False, overlapped: tuple[bool, bool] = (True, True), bufsize: int = 8192) -> tuple[int, int]: ...
 
     class PipeHandle:
         def __init__(self, handle: int) -> None: ...
-        if sys.version_info >= (3, 8):
-            def __del__(self, _warn: _WarnFunction = ...) -> None: ...
-        else:
-            def __del__(self) -> None: ...
-
+        def __del__(self) -> None: ...
         def __enter__(self) -> Self: ...
         def __exit__(self, t: type[BaseException] | None, v: BaseException | None, tb: TracebackType | None) -> None: ...
         @property

mypy/typeshed/stdlib/builtins.pyi

@@ -18,6 +18,7 @@ from _typeshed import (
     SupportsAiter,
     SupportsAnext,
     SupportsDivMod,
+    SupportsFlush,
     SupportsIter,
     SupportsKeysAndGetItem,
     SupportsLenAndGetItem,
@@ -1194,7 +1195,7 @@ if sys.version_info >= (3, 10):
     # See discussion in #7491 and pure-Python implementation of `anext` at https://github.com/python/cpython/blob/ea786a882b9ed4261eafabad6011bc7ef3b5bf94/Lib/test/test_asyncgen.py#L52-L80
     def anext(__i: _SupportsSynchronousAnext[_AwaitableT]) -> _AwaitableT: ...
     @overload
-    async def anext(__i: SupportsAnext[_T], default: _VT) -> _T | _VT: ...
+    async def anext(__i: SupportsAnext[_T], __default: _VT) -> _T | _VT: ...
 
 # compile() returns a CodeType, unless the flags argument includes PyCF_ONLY_AST (=1024),
 # in which case it returns ast.AST. We have overloads for flag 0 (the default) and for
@@ -1340,9 +1341,9 @@ def getattr(__o: object, __name: str, __default: None) -> Any | None: ...
 @overload
 def getattr(__o: object, __name: str, __default: bool) -> Any | bool: ...
 @overload
-def getattr(__o: object, name: str, __default: list[Any]) -> Any | list[Any]: ...
+def getattr(__o: object, __name: str, __default: list[Any]) -> Any | list[Any]: ...
 @overload
-def getattr(__o: object, name: str, __default: dict[Any, Any]) -> Any | dict[Any, Any]: ...
+def getattr(__o: object, __name: str, __default: dict[Any, Any]) -> Any | dict[Any, Any]: ...
 @overload
 def getattr(__o: object, __name: str, __default: _T) -> Any | _T: ...
 def globals() -> dict[str, Any]: ...
@@ -1357,13 +1358,13 @@ class _GetItemIterable(Protocol[_T_co]):
     def __getitem__(self, __i: int) -> _T_co: ...
 
 @overload
-def iter(__iterable: SupportsIter[_SupportsNextT]) -> _SupportsNextT: ...
+def iter(__object: SupportsIter[_SupportsNextT]) -> _SupportsNextT: ...
 @overload
-def iter(__iterable: _GetItemIterable[_T]) -> Iterator[_T]: ...
+def iter(__object: _GetItemIterable[_T]) -> Iterator[_T]: ...
 @overload
-def iter(__function: Callable[[], _T | None], __sentinel: None) -> Iterator[_T]: ...
+def iter(__object: Callable[[], _T | None], __sentinel: None) -> Iterator[_T]: ...
 @overload
-def iter(__function: Callable[[], _T], __sentinel: object) -> Iterator[_T]: ...
+def iter(__object: Callable[[], _T], __sentinel: object) -> Iterator[_T]: ...
 
 # Keep this alias in sync with unittest.case._ClassInfo
 if sys.version_info >= (3, 10):
@@ -1544,8 +1545,7 @@ def open(
 ) -> IO[Any]: ...
 def ord(__c: str | bytes | bytearray) -> int: ...
 
-class _SupportsWriteAndFlush(SupportsWrite[_T_contra], Protocol[_T_contra]):
-    def flush(self) -> None: ...
+class _SupportsWriteAndFlush(SupportsWrite[_T_contra], SupportsFlush, Protocol[_T_contra]): ...
 
 @overload
 def print(

mypy/typeshed/stdlib/cmath.pyi

@@ -30,7 +30,7 @@ def exp(__z: _C) -> complex: ...
 def isclose(a: _C, b: _C, *, rel_tol: SupportsFloat = 1e-09, abs_tol: SupportsFloat = 0.0) -> bool: ...
 def isinf(__z: _C) -> bool: ...
 def isnan(__z: _C) -> bool: ...
-def log(__x: _C, __y_obj: _C = ...) -> complex: ...
+def log(__x: _C, __base: _C = ...) -> complex: ...
 def log10(__z: _C) -> complex: ...
 def phase(__z: _C) -> float: ...
 def polar(__z: _C) -> tuple[float, float]: ...

mypy/typeshed/stdlib/codecs.pyi

@@ -213,7 +213,7 @@ class StreamWriter(Codec):
     def reset(self) -> None: ...
     def __enter__(self) -> Self: ...
     def __exit__(self, type: type[BaseException] | None, value: BaseException | None, tb: types.TracebackType | None) -> None: ...
-    def __getattr__(self, name: str, getattr: Callable[[str], Any] = ...) -> Any: ...
+    def __getattr__(self, name: str, getattr: Callable[[Any, str], Any] = ...) -> Any: ...
 
 class StreamReader(Codec):
     stream: _ReadableStream
@@ -227,7 +227,7 @@ class StreamReader(Codec):
     def __exit__(self, type: type[BaseException] | None, value: BaseException | None, tb: types.TracebackType | None) -> None: ...
     def __iter__(self) -> Self: ...
     def __next__(self) -> str: ...
-    def __getattr__(self, name: str, getattr: Callable[[str], Any] = ...) -> Any: ...
+    def __getattr__(self, name: str, getattr: Callable[[Any, str], Any] = ...) -> Any: ...
 
 # Doesn't actually inherit from TextIO, but wraps a BinaryIO to provide text reading and writing
 # and delegates attributes to the underlying binary stream with __getattr__.

mypy/typeshed/stdlib/collections/__init__.pyi

@@ -372,6 +372,13 @@ class OrderedDict(dict[_KT, _VT], Reversible[_KT], Generic[_KT, _VT]):
     def setdefault(self: OrderedDict[_KT, _T | None], key: _KT, default: None = None) -> _T | None: ...
     @overload
     def setdefault(self, key: _KT, default: _VT) -> _VT: ...
+    # Same as dict.pop, but accepts keyword arguments
+    @overload
+    def pop(self, key: _KT) -> _VT: ...
+    @overload
+    def pop(self, key: _KT, default: _VT) -> _VT: ...
+    @overload
+    def pop(self, key: _KT, default: _T) -> _VT | _T: ...
     def __eq__(self, __value: object) -> bool: ...
     if sys.version_info >= (3, 9):
         @overload

mypy/typeshed/stdlib/compileall.pyi

@@ -6,7 +6,7 @@ from typing import Any, Protocol
 __all__ = ["compile_dir", "compile_file", "compile_path"]
 
 class _SupportsSearch(Protocol):
-    def search(self, string: str) -> Any: ...
+    def search(self, __string: str) -> Any: ...
 
 if sys.version_info >= (3, 10):
     def compile_dir(

mypy/typeshed/stdlib/contextlib.pyi

@@ -56,7 +56,7 @@ class AbstractAsyncContextManager(Protocol[_T_co]):
 class ContextDecorator:
     def __call__(self, func: _F) -> _F: ...
 
-class _GeneratorContextManager(AbstractContextManager[_T_co], ContextDecorator, Generic[_T_co]):
+class _GeneratorContextManager(AbstractContextManager[_T_co], ContextDecorator):
     # __init__ and all instance attributes are actually inherited from _GeneratorContextManagerBase
     # _GeneratorContextManagerBase is more trouble than it's worth to include in the stub; see #6676
     def __init__(self, func: Callable[..., Iterator[_T_co]], args: tuple[Any, ...], kwds: dict[str, Any]) -> None: ...
@@ -81,7 +81,7 @@ if sys.version_info >= (3, 10):
     class AsyncContextDecorator:
         def __call__(self, func: _AF) -> _AF: ...
 
-    class _AsyncGeneratorContextManager(AbstractAsyncContextManager[_T_co], AsyncContextDecorator, Generic[_T_co]):
+    class _AsyncGeneratorContextManager(AbstractAsyncContextManager[_T_co], AsyncContextDecorator):
         # __init__ and these attributes are actually defined in the base class _GeneratorContextManagerBase,
         # which is more trouble than it's worth to include in the stub (see #6676)
         def __init__(self, func: Callable[..., AsyncIterator[_T_co]], args: tuple[Any, ...], kwds: dict[str, Any]) -> None: ...