Merge branch 'main' into removing-setuptools._distutils

Author: Avasam

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
         name: Run ruff on the test cases
         args:
           - "--exit-non-zero-on-fix"
-          - "--select=FA,I,RUF100"
+          - "--select=FA,I,ICN001,RUF100"
           - "--no-force-exclude"
           - "--unsafe-fixes"
         files: '.*test_cases/.+\.py$'

pyproject.toml

@@ -83,6 +83,8 @@ select = [
     "FURB169", # Compare the identities of `{object}` and None instead of their respective types
     "FURB177", # Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups
     "FURB187", # Use of assignment of `reversed` on list `{name}`
+    # Used for lint.flake8-import-conventions.aliases
+    "ICN001", # `{name}` should be imported as `{asname}`
     # Autofixable flake8-use-pathlib only
     "PTH201", # Do not pass the current directory explicitly to `Path`
     "PTH210", # Invalid suffix passed to `.with_suffix()`
@@ -217,6 +219,8 @@ ignore = [
     "PLC0414", # Import alias does not rename original package
 ]
 "*_pb2.pyi" = [
+    # Special autogenerated typing --> typing_extensions aliases
+    "ICN001", # `{name}` should be imported as `{asname}`
     # Leave the docstrings as-is, matching source
     "D", # pydocstyle
     # See comment on black's force-exclude config above
@@ -226,6 +230,11 @@ ignore = [
 [tool.ruff.lint.pydocstyle]
 convention = "pep257" # https://docs.astral.sh/ruff/settings/#lint_pydocstyle_convention
 
+[tool.ruff.lint.flake8-import-conventions.aliases]
+# Prevent aliasing these, as it causes false-negatives for certain rules
+typing_extensions = "typing_extensions"
+typing = "typing"
+
 [tool.ruff.lint.isort]
 split-on-trailing-comma = false
 combine-as-imports = true

stdlib/@tests/stubtest_allowlists/py310.txt

@@ -295,3 +295,9 @@ typing_extensions\.Annotated  # Undocumented implementation details
 # (Remove once 3.10.17 becomes available for all platforms)
 (email._header_value_parser.get_encoded_word)?
 (email._header_value_parser.make_quoted_pairs)?
+
+# These methods have no default implementation for Python < 3.13.
+_pickle.Pickler.persistent_id
+_pickle.Unpickler.persistent_load
+pickle.Pickler.persistent_id
+pickle.Unpickler.persistent_load

stdlib/@tests/stubtest_allowlists/py311.txt

@@ -259,3 +259,9 @@ typing_extensions\.Annotated  # Undocumented implementation details
 # (Remove once 3.11.12 becomes available for all platforms)
 (email._header_value_parser.get_encoded_word)?
 (email._header_value_parser.make_quoted_pairs)?
+
+# These methods have no default implementation for Python < 3.13.
+_pickle.Pickler.persistent_id
+_pickle.Unpickler.persistent_load
+pickle.Pickler.persistent_id
+pickle.Unpickler.persistent_load

stdlib/@tests/stubtest_allowlists/py312.txt

@@ -228,3 +228,9 @@ sunau.Au_write.initfp
 threading.Lock  # Factory function at runtime, but that wouldn't let us use it in type hints
 types.SimpleNamespace.__init__  # class doesn't accept positional arguments but has default C signature
 typing_extensions\.Annotated  # Undocumented implementation details
+
+# These methods have no default implementation for Python < 3.13.
+_pickle.Pickler.persistent_id
+_pickle.Unpickler.persistent_load
+pickle.Pickler.persistent_id
+pickle.Unpickler.persistent_load

stdlib/@tests/stubtest_allowlists/py39.txt

@@ -245,3 +245,9 @@ typing_extensions\.Annotated  # Undocumented implementation details
 # Incompatible changes introduced in Python 3.9.22
 # (Remove once 3.9.22 becomes available for all platforms)
 (email._header_value_parser.get_encoded_word)?
+
+# These methods have no default implementation for Python < 3.13.
+_pickle.Pickler.persistent_id
+_pickle.Unpickler.persistent_load
+pickle.Pickler.persistent_id
+pickle.Unpickler.persistent_load

stdlib/@tests/test_cases/check_re.py

@@ -2,18 +2,18 @@
 
 import mmap
 import re
-import typing as t
+from typing import AnyStr, Match, Optional
 from typing_extensions import assert_type
 
 
 def check_search(str_pat: re.Pattern[str], bytes_pat: re.Pattern[bytes]) -> None:
-    assert_type(str_pat.search("x"), t.Optional[t.Match[str]])
-    assert_type(bytes_pat.search(b"x"), t.Optional[t.Match[bytes]])
-    assert_type(bytes_pat.search(bytearray(b"x")), t.Optional[t.Match[bytes]])
-    assert_type(bytes_pat.search(mmap.mmap(0, 10)), t.Optional[t.Match[bytes]])
+    assert_type(str_pat.search("x"), Optional[Match[str]])
+    assert_type(bytes_pat.search(b"x"), Optional[Match[bytes]])
+    assert_type(bytes_pat.search(bytearray(b"x")), Optional[Match[bytes]])
+    assert_type(bytes_pat.search(mmap.mmap(0, 10)), Optional[Match[bytes]])
 
 
-def check_search_with_AnyStr(pattern: re.Pattern[t.AnyStr], string: t.AnyStr) -> re.Match[t.AnyStr]:
+def check_search_with_AnyStr(pattern: re.Pattern[AnyStr], string: AnyStr) -> re.Match[AnyStr]:
     """See issue #9591"""
     match = pattern.search(string)
     if match is None:

stdlib/@tests/test_cases/typing/check_regression_issue_9296.py

@@ -1,15 +1,15 @@
 from __future__ import annotations
 
-import typing as t
+from typing import Any, KeysView, TypeVar
 
-KT = t.TypeVar("KT")
+KT = TypeVar("KT")
 
 
-class MyKeysView(t.KeysView[KT]):
+class MyKeysView(KeysView[KT]):
     pass
 
 
-d: dict[t.Any, t.Any] = {}
+d: dict[Any, Any] = {}
 dict_keys = type(d.keys())
 
 # This should not cause an error like `Member "register" is unknown`:

stdlib/_pickle.pyi

@@ -1,4 +1,3 @@
-import sys
 from _typeshed import ReadableBuffer, SupportsWrite
 from collections.abc import Callable, Iterable, Iterator, Mapping
 from pickle import PickleBuffer as PickleBuffer
@@ -75,10 +74,9 @@ class Pickler:
     def memo(self, value: PicklerMemoProxy | dict[int, tuple[int, Any]]) -> None: ...
     def dump(self, obj: Any, /) -> None: ...
     def clear_memo(self) -> None: ...
-    if sys.version_info >= (3, 13):
-        def persistent_id(self, obj: Any, /) -> Any: ...
-    else:
-        persistent_id: Callable[[Any], Any]
+
+    # this method has no default implementation for Python < 3.13
+    def persistent_id(self, obj: Any, /) -> Any: ...
 
 @type_check_only
 class UnpicklerMemoProxy:
@@ -101,7 +99,6 @@ class Unpickler:
     def memo(self, value: UnpicklerMemoProxy | dict[int, tuple[int, Any]]) -> None: ...
     def load(self) -> Any: ...
     def find_class(self, module_name: str, global_name: str, /) -> Any: ...
-    if sys.version_info >= (3, 13):
-        def persistent_load(self, pid: Any, /) -> Any: ...
-    else:
-        persistent_load: Callable[[Any], Any]
+
+    # this method has no default implementation for Python < 3.13
+    def persistent_load(self, pid: Any, /) -> Any: ...

stdlib/_typeshed/__init__.pyi

@@ -3,7 +3,6 @@
 # See the README.md file in this directory for more information.
 
 import sys
-import typing_extensions
 from collections.abc import Awaitable, Callable, Iterable, Sequence, Set as AbstractSet, Sized
 from dataclasses import Field
 from os import PathLike
@@ -23,7 +22,7 @@ from typing import (
     final,
     overload,
 )
-from typing_extensions import Buffer, LiteralString, TypeAlias
+from typing_extensions import Buffer, LiteralString, Self as _Self, TypeAlias
 
 _KT = TypeVar("_KT")
 _KT_co = TypeVar("_KT_co", covariant=True)
@@ -329,9 +328,9 @@ class structseq(Generic[_T_co]):
     # The second parameter will accept a dict of any kind without raising an exception,
     # but only has any meaning if you supply it a dict where the keys are strings.
     # https://github.com/python/typeshed/pull/6560#discussion_r767149830
-    def __new__(cls, sequence: Iterable[_T_co], dict: dict[str, Any] = ...) -> typing_extensions.Self: ...
+    def __new__(cls, sequence: Iterable[_T_co], dict: dict[str, Any] = ...) -> _Self: ...
     if sys.version_info >= (3, 13):
-        def __replace__(self, **kwargs: Any) -> typing_extensions.Self: ...
+        def __replace__(self, **kwargs: Any) -> _Self: ...
 
 # Superset of typing.AnyStr that also includes LiteralString
 AnyOrLiteralStr = TypeVar("AnyOrLiteralStr", str, bytes, LiteralString)  # noqa: Y001