Merge branch 'main' into check-exlude-list-order

Author: srittau

lib/ts_utils/utils.py

@@ -233,7 +233,7 @@ def close(self: TemporaryFileWrapper[str]) -> None:
 @functools.cache
 def get_gitignore_spec() -> pathspec.PathSpec:
     with GITIGNORE_PATH.open(encoding="UTF-8") as f:
-        return pathspec.GitIgnoreSpec.from_lines(f)  # pyright: ignore[reportUnknownMemberType,reportUnknownVariableType]
+        return pathspec.GitIgnoreSpec.from_lines(f)
 
 
 def spec_matches_path(spec: pathspec.PathSpec, path: Path) -> bool:

requirements-tests.txt

@@ -8,7 +8,7 @@ aiohttp==3.13.3
 grpcio-tools>=1.76.0 # For grpc_tools.protoc
 mypy-protobuf==4.0.0
 packaging==25.0
-pathspec>=1.0.0
+pathspec>=1.0.3
 pre-commit
 # Required by create_baseline_stubs.py. Must match .pre-commit-config.yaml.
 ruff==0.14.10

stdlib/@tests/test_cases/check_functools.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from functools import cached_property, wraps
+from functools import cache, cached_property, wraps
 from typing import Callable, TypeVar
 from typing_extensions import ParamSpec, assert_type
 
@@ -96,3 +96,15 @@ class Y(X):
     @cached_property
     def some(self) -> Child:  # safe override
         return Child()
+
+
+class CachedParent:
+    @cache
+    def method(self) -> Parent:
+        return Parent()
+
+
+class CachedChild(CachedParent):
+    @cache
+    def method(self) -> Child:
+        return Child()

stdlib/@tests/test_cases/itertools/check_batched.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+import sys
+from typing_extensions import assert_type
+
+if sys.version_info >= (3, 13):
+    from itertools import batched
+
+    assert_type(batched([0], 1, strict=True), batched[tuple[int]])
+    assert_type(batched([0, 0], 2, strict=True), batched[tuple[int, int]])
+    assert_type(batched([0, 0, 0], 3, strict=True), batched[tuple[int, int, int]])
+    assert_type(batched([0, 0, 0, 0], 4, strict=True), batched[tuple[int, int, int, int]])
+    assert_type(batched([0, 0, 0, 0, 0], 5, strict=True), batched[tuple[int, int, int, int, int]])
+
+    assert_type(batched([0], 2), batched[tuple[int, ...]])
+    assert_type(batched([0], 2, strict=False), batched[tuple[int, ...]])
+
+    def f() -> int:
+        return 3
+
+    assert_type(batched([0, 0, 0], f(), strict=True), batched[tuple[int, ...]])

stdlib/builtins.pyi

@@ -1176,9 +1176,9 @@ class dict(MutableMapping[_KT, _VT]):
     # __init__ should be kept roughly in line with `collections.UserDict.__init__`, which has similar semantics
     # Also multiprocessing.managers.SyncManager.dict()
     @overload
-    def __init__(self) -> None: ...
+    def __init__(self, /) -> None: ...
     @overload
-    def __init__(self: dict[str, _VT], **kwargs: _VT) -> None: ...  # pyright: ignore[reportInvalidTypeVarUse]  #11780
+    def __init__(self: dict[str, _VT], /, **kwargs: _VT) -> None: ...  # pyright: ignore[reportInvalidTypeVarUse]  #11780
     @overload
     def __init__(self, map: SupportsKeysAndGetItem[_KT, _VT], /) -> None: ...
     @overload
@@ -1203,7 +1203,7 @@ class dict(MutableMapping[_KT, _VT]):
     def __init__(self: dict[str, str], iterable: Iterable[list[str]], /) -> None: ...
     @overload
     def __init__(self: dict[bytes, bytes], iterable: Iterable[list[bytes]], /) -> None: ...
-    def __new__(cls, *args: Any, **kwargs: Any) -> Self: ...
+    def __new__(cls, /, *args: Any, **kwargs: Any) -> Self: ...
     def copy(self) -> dict[_KT, _VT]: ...
     def keys(self) -> dict_keys[_KT, _VT]: ...
     def values(self) -> dict_values[_KT, _VT]: ...

stdlib/cmath.pyi

@@ -9,6 +9,7 @@ nan: Final[float]
 nanj: Final[complex]
 tau: Final[float]
 
+_F: TypeAlias = SupportsFloat | SupportsIndex
 _C: TypeAlias = SupportsFloat | SupportsComplex | SupportsIndex | complex
 
 def acos(z: _C, /) -> complex: ...
@@ -27,7 +28,7 @@ def log(z: _C, base: _C = ..., /) -> complex: ...
 def log10(z: _C, /) -> complex: ...
 def phase(z: _C, /) -> float: ...
 def polar(z: _C, /) -> tuple[float, float]: ...
-def rect(r: float, phi: float, /) -> complex: ...
+def rect(r: _F, phi: _F, /) -> complex: ...
 def sin(z: _C, /) -> complex: ...
 def sinh(z: _C, /) -> complex: ...
 def sqrt(z: _C, /) -> complex: ...

stdlib/ctypes/__init__.pyi

@@ -169,11 +169,12 @@ def create_unicode_buffer(init: int | str, size: int | None = None) -> Array[c_w
 if sys.version_info >= (3, 13):
     @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
     def SetPointerType(pointer: type[_Pointer[Any]], cls: _CTypeBaseType) -> None: ...
+    @deprecated("Soft deprecated since Python 3.13. Use multiplication instead.")
+    def ARRAY(typ: _CT, len: int) -> Array[_CT]: ...
 
 else:
     def SetPointerType(pointer: type[_Pointer[Any]], cls: _CTypeBaseType) -> None: ...
-
-def ARRAY(typ: _CT, len: int) -> Array[_CT]: ...  # Soft Deprecated, no plans to remove
+    def ARRAY(typ: _CT, len: int) -> Array[_CT]: ...
 
 if sys.platform == "win32":
     def DllCanUnloadNow() -> int: ...

stdlib/email/utils.pyi

@@ -44,16 +44,7 @@ def parsedate(data: str) -> tuple[int, int, int, int, int, int, int, int, int] |
 def parsedate_tz(data: None) -> None: ...
 @overload
 def parsedate_tz(data: str) -> _PDTZ | None: ...
-
-if sys.version_info >= (3, 10):
-    @overload
-    def parsedate_to_datetime(data: None) -> None: ...
-    @overload
-    def parsedate_to_datetime(data: str) -> datetime.datetime: ...
-
-else:
-    def parsedate_to_datetime(data: str) -> datetime.datetime: ...
-
+def parsedate_to_datetime(data: str) -> datetime.datetime: ...
 def mktime_tz(data: _PDTZ) -> int: ...
 def formatdate(timeval: float | None = None, localtime: bool = False, usegmt: bool = False) -> str: ...
 def format_datetime(dt: datetime.datetime, usegmt: bool = False) -> str: ...

stdlib/faulthandler.pyi

@@ -3,21 +3,23 @@ from _typeshed import FileDescriptorLike
 
 def cancel_dump_traceback_later() -> None: ...
 def disable() -> None: ...
-def dump_traceback(file: FileDescriptorLike = ..., all_threads: bool = ...) -> None: ...
+def dump_traceback(file: FileDescriptorLike = sys.stderr, all_threads: bool = True) -> None: ...
 
 if sys.version_info >= (3, 14):
-    def dump_c_stack(file: FileDescriptorLike = ...) -> None: ...
+    def dump_c_stack(file: FileDescriptorLike = sys.stderr) -> None: ...
 
-def dump_traceback_later(timeout: float, repeat: bool = ..., file: FileDescriptorLike = ..., exit: bool = ...) -> None: ...
+def dump_traceback_later(
+    timeout: float, repeat: bool = False, file: FileDescriptorLike = sys.stderr, exit: bool = False
+) -> None: ...
 
 if sys.version_info >= (3, 14):
-    def enable(file: FileDescriptorLike = ..., all_threads: bool = ..., c_stack: bool = True) -> None: ...
+    def enable(file: FileDescriptorLike = sys.stderr, all_threads: bool = True, c_stack: bool = True) -> None: ...
 
 else:
-    def enable(file: FileDescriptorLike = ..., all_threads: bool = ...) -> None: ...
+    def enable(file: FileDescriptorLike = sys.stderr, all_threads: bool = True) -> None: ...
 
 def is_enabled() -> bool: ...
 
 if sys.platform != "win32":
-    def register(signum: int, file: FileDescriptorLike = ..., all_threads: bool = ..., chain: bool = ...) -> None: ...
+    def register(signum: int, file: FileDescriptorLike = sys.stderr, all_threads: bool = True, chain: bool = False) -> None: ...
     def unregister(signum: int, /) -> None: ...

stdlib/fileinput.pyi

@@ -3,7 +3,7 @@ from _typeshed import AnyStr_co, StrOrBytesPath
 from collections.abc import Callable, Iterable
 from types import GenericAlias, TracebackType
 from typing import IO, Any, AnyStr, Generic, Literal, Protocol, overload, type_check_only
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self, TypeAlias, deprecated
 
 __all__ = [
     "input",
@@ -207,4 +207,9 @@ if sys.version_info >= (3, 10):
 else:
     def hook_compressed(filename: StrOrBytesPath, mode: str) -> IO[Any]: ...
 
-def hook_encoded(encoding: str, errors: str | None = None) -> Callable[[StrOrBytesPath, str], IO[Any]]: ...
+if sys.version_info >= (3, 10):
+    @deprecated("Deprecated since Python 3.10. Use `fileinput.input` or `fileinput.FileInput` instead.")
+    def hook_encoded(encoding: str, errors: str | None = None) -> Callable[[StrOrBytesPath, str], IO[Any]]: ...
+
+else:
+    def hook_encoded(encoding: str, errors: str | None = None) -> Callable[[StrOrBytesPath, str], IO[Any]]: ...