Sync typeshed (#20157)

Source commit:

python/typeshed@bf72147

Author: github-actions[bot]

mypy/typeshed/stdlib/builtins.pyi

@@ -1960,6 +1960,10 @@ class BaseException:
     def __new__(cls, *args: Any, **kwds: Any) -> Self: ...
     def __setstate__(self, state: dict[str, Any] | None, /) -> None: ...
     def with_traceback(self, tb: TracebackType | None, /) -> Self: ...
+    # Necessary for security-focused static analyzers (e.g, pysa)
+    # See https://github.com/python/typeshed/pull/14900
+    def __str__(self) -> str: ...  # noqa: Y029
+    def __repr__(self) -> str: ...  # noqa: Y029
     if sys.version_info >= (3, 11):
         # only present after add_note() is called
         __notes__: list[str]

mypy/typeshed/stdlib/cmath.pyi

@@ -23,7 +23,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, base: _C = ..., /) -> complex: ...
+def log(z: _C, base: _C = ..., /) -> complex: ...
 def log10(z: _C, /) -> complex: ...
 def phase(z: _C, /) -> float: ...
 def polar(z: _C, /) -> tuple[float, float]: ...

mypy/typeshed/stdlib/contextlib.pyi

@@ -4,7 +4,7 @@ from _typeshed import FileDescriptorOrPath, Unused
 from abc import ABC, abstractmethod
 from collections.abc import AsyncGenerator, AsyncIterator, Awaitable, Callable, Generator, Iterator
 from types import TracebackType
-from typing import IO, Any, Generic, Protocol, TypeVar, overload, runtime_checkable, type_check_only
+from typing import Any, Generic, Protocol, TypeVar, overload, runtime_checkable, type_check_only
 from typing_extensions import ParamSpec, Self, TypeAlias
 
 __all__ = [
@@ -30,7 +30,6 @@ if sys.version_info >= (3, 11):
 
 _T = TypeVar("_T")
 _T_co = TypeVar("_T_co", covariant=True)
-_T_io = TypeVar("_T_io", bound=IO[str] | None)
 _ExitT_co = TypeVar("_ExitT_co", covariant=True, bound=bool | None, default=bool | None)
 _F = TypeVar("_F", bound=Callable[..., Any])
 _G_co = TypeVar("_G_co", bound=Generator[Any, Any, Any] | AsyncGenerator[Any, Any], covariant=True)
@@ -141,14 +140,24 @@ class suppress(AbstractContextManager[None, bool]):
         self, exctype: type[BaseException] | None, excinst: BaseException | None, exctb: TracebackType | None
     ) -> bool: ...
 
-class _RedirectStream(AbstractContextManager[_T_io, None]):
-    def __init__(self, new_target: _T_io) -> None: ...
+# This is trying to describe what is needed for (most?) uses
+# of `redirect_stdout` and `redirect_stderr`.
+# https://github.com/python/typeshed/issues/14903
+@type_check_only
+class _SupportsRedirect(Protocol):
+    def write(self, s: str, /) -> int: ...
+    def flush(self) -> None: ...
+
+_SupportsRedirectT = TypeVar("_SupportsRedirectT", bound=_SupportsRedirect | None)
+
+class _RedirectStream(AbstractContextManager[_SupportsRedirectT, None]):
+    def __init__(self, new_target: _SupportsRedirectT) -> None: ...
     def __exit__(
         self, exctype: type[BaseException] | None, excinst: BaseException | None, exctb: TracebackType | None
     ) -> None: ...
 
-class redirect_stdout(_RedirectStream[_T_io]): ...
-class redirect_stderr(_RedirectStream[_T_io]): ...
+class redirect_stdout(_RedirectStream[_SupportsRedirectT]): ...
+class redirect_stderr(_RedirectStream[_SupportsRedirectT]): ...
 
 class _BaseExitStack(Generic[_ExitT_co]):
     def enter_context(self, cm: AbstractContextManager[_T, _ExitT_co]) -> _T: ...

mypy/typeshed/stdlib/enum.pyi

@@ -309,6 +309,7 @@ if sys.version_info >= (3, 11):
     def global_enum(cls: _EnumerationT, update_str: bool = False) -> _EnumerationT: ...
     def global_enum_repr(self: Enum) -> str: ...
     def global_flag_repr(self: Flag) -> str: ...
+    def show_flag_values(value: int) -> list[int]: ...
 
 if sys.version_info >= (3, 12):
     # The body of the class is the same, but the base classes are different.

mypy/typeshed/stdlib/os/__init__.pyi

@@ -729,6 +729,9 @@ environ: _Environ[str]
 if sys.platform != "win32":
     environb: _Environ[bytes]
 
+if sys.version_info >= (3, 14):
+    def reload_environ() -> None: ...
+
 if sys.version_info >= (3, 11) or sys.platform != "win32":
     EX_OK: Final[int]
 

mypy/typeshed/stdlib/sys/__init__.pyi

@@ -354,6 +354,13 @@ else:
 def _current_frames() -> dict[int, FrameType]: ...
 def _getframe(depth: int = 0, /) -> FrameType: ...
 
+# documented -- see https://docs.python.org/3/library/sys.html#sys._current_exceptions
+if sys.version_info >= (3, 12):
+    def _current_exceptions() -> dict[int, BaseException | None]: ...
+
+else:
+    def _current_exceptions() -> dict[int, OptExcInfo]: ...
+
 if sys.version_info >= (3, 12):
     def _getframemodulename(depth: int = 0) -> str | None: ...
 
@@ -366,6 +373,10 @@ if sys.version_info >= (3, 11):
     def exception() -> BaseException | None: ...
 
 def exit(status: _ExitCode = None, /) -> NoReturn: ...
+
+if sys.platform == "android":  # noqa: Y008
+    def getandroidapilevel() -> int: ...
+
 def getallocatedblocks() -> int: ...
 def getdefaultencoding() -> str: ...
 
@@ -501,3 +512,4 @@ if sys.version_info >= (3, 12):
 if sys.version_info >= (3, 14):
     def is_remote_debug_enabled() -> bool: ...
     def remote_exec(pid: int, script: StrOrBytesPath) -> None: ...
+    def _is_immortal(op: object, /) -> bool: ...

mypy/typeshed/stdlib/sysconfig.pyi

@@ -1,6 +1,6 @@
 import sys
 from typing import IO, Any, Literal, overload
-from typing_extensions import deprecated
+from typing_extensions import LiteralString, deprecated
 
 __all__ = [
     "get_config_h_filename",
@@ -28,8 +28,10 @@ def get_config_vars(arg: str, /, *args: str) -> list[Any]: ...
 def get_scheme_names() -> tuple[str, ...]: ...
 
 if sys.version_info >= (3, 10):
-    def get_default_scheme() -> str: ...
-    def get_preferred_scheme(key: Literal["prefix", "home", "user"]) -> str: ...
+    def get_default_scheme() -> LiteralString: ...
+    def get_preferred_scheme(key: Literal["prefix", "home", "user"]) -> LiteralString: ...
+    # Documented -- see https://docs.python.org/3/library/sysconfig.html#sysconfig._get_preferred_schemes
+    def _get_preferred_schemes() -> dict[Literal["prefix", "home", "user"], LiteralString]: ...
 
 def get_path_names() -> tuple[str, ...]: ...
 def get_path(name: str, scheme: str = ..., vars: dict[str, Any] | None = None, expand: bool = True) -> str: ...

mypy/typeshed/stdlib/turtle.pyi

@@ -266,7 +266,7 @@ class TurtleScreen(TurtleScreenBase):
     def window_height(self) -> int: ...
     def getcanvas(self) -> Canvas: ...
     def getshapes(self) -> list[str]: ...
-    def onclick(self, fun: Callable[[float, float], object], btn: int = 1, add: Any | None = None) -> None: ...
+    def onclick(self, fun: Callable[[float, float], object], btn: int = 1, add: bool | None = None) -> None: ...
     def onkey(self, fun: Callable[[], object], key: str) -> None: ...
     def listen(self, xdummy: float | None = None, ydummy: float | None = None) -> None: ...
     def ontimer(self, fun: Callable[[], object], t: int = 0) -> None: ...
@@ -561,7 +561,7 @@ def window_width() -> int: ...
 def window_height() -> int: ...
 def getcanvas() -> Canvas: ...
 def getshapes() -> list[str]: ...
-def onclick(fun: Callable[[float, float], object], btn: int = 1, add: Any | None = None) -> None: ...
+def onclick(fun: Callable[[float, float], object], btn: int = 1, add: bool | None = None) -> None: ...
 def onkey(fun: Callable[[], object], key: str) -> None: ...
 def listen(xdummy: float | None = None, ydummy: float | None = None) -> None: ...
 def ontimer(fun: Callable[[], object], t: int = 0) -> None: ...
@@ -776,8 +776,8 @@ def getturtle() -> Turtle: ...
 
 getpen = getturtle
 
-def onrelease(fun: Callable[[float, float], object], btn: int = 1, add: Any | None = None) -> None: ...
-def ondrag(fun: Callable[[float, float], object], btn: int = 1, add: Any | None = None) -> None: ...
+def onrelease(fun: Callable[[float, float], object], btn: int = 1, add: bool | None = None) -> None: ...
+def ondrag(fun: Callable[[float, float], object], btn: int = 1, add: bool | None = None) -> None: ...
 def undo() -> None: ...
 
 turtlesize = shapesize

mypy/typeshed/stdlib/zlib.pyi

@@ -26,8 +26,8 @@ Z_RLE: Final = 3
 Z_SYNC_FLUSH: Final = 2
 Z_TREES: Final = 6
 
-if sys.version_info >= (3, 14) and sys.platform == "win32":
-    # Available when zlib was built with zlib-ng, usually only on Windows
+if sys.version_info >= (3, 14):
+    # Available when zlib was built with zlib-ng
     ZLIBNG_VERSION: Final[str]
 
 class error(Exception): ...