Merge branch 'main' into feature/simple-websocket

Author: lev-blit

CONTRIBUTING.md

@@ -311,7 +311,7 @@ def foo(x: Incomplete | None) -> list[Incomplete]: ...
 ### What to do when a project's documentation and implementation disagree
 
 Type stubs are meant to be external type annotations for a given
-library.  While they are useful documentation in its own merit, they
+library.  While they are useful documentation in their own right, they
 augment the project's concrete implementation, not the project's
 documentation.  Whenever you find them disagreeing, model the type
 information after the actual implementation and file an issue on the

README.md

@@ -7,10 +7,10 @@
 ## About
 
 Typeshed contains external type annotations for the Python standard library
-and Python builtins, as well as third party packages as contributed by
+and Python builtins, as well as third-party packages that are contributed by
 people external to those projects.
 
-This data can e.g. be used for static analysis, type checking, type inference,
+This data can, e.g., be used for static analysis, type checking, type inference,
 and autocompletion.
 
 For information on how to use typeshed, read below.  Information for
@@ -29,8 +29,8 @@ If you're just using a type checker (e.g. [mypy](https://github.com/python/mypy/
 [pyright](https://github.com/microsoft/pyright), or PyCharm's built-in type
 checker), as opposed to
 developing it, you don't need to interact with the typeshed repo at
-all: a copy of standard library part of typeshed is bundled with type checkers.
-And type stubs for third party packages and modules you are using can
+all: a copy of the standard library part of typeshed is bundled with type checkers.
+And type stubs for third-party packages and modules you are using can
 be installed from PyPI. For example, if you are using `html5lib` and `requests`,
 you can install the type stubs using
 
@@ -70,7 +70,7 @@ package you're using, each with its own tradeoffs:
    type checking due to changes in the stubs.
 
    Another risk of this strategy is that stubs often lag behind
-   the package being stubbed. You might want to force the package being stubbed
+   the package that is being stubbed. You might want to force the package being stubbed
    to a certain minimum version because it fixes a critical bug, but if
    correspondingly updated stubs have not been released, your type
    checking results may not be fully accurate.
@@ -119,6 +119,6 @@ a review of your type annotations or stubs outside of typeshed, head over to
 [our discussion forum](https://github.com/python/typing/discussions).
 For less formal discussion, try the typing chat room on
 [gitter.im](https://gitter.im/python/typing).  Some typeshed maintainers
-are almost always present; feel free to find us there and we're happy
+are almost always present; feel free to find us there, and we're happy
 to chat.  Substantive technical discussion will be directed to the
 issue tracker.

requirements-tests.txt

@@ -1,7 +1,7 @@
 # Type checkers that we test our stubs against. These should always
 # be pinned to a specific version to make failure reproducible.
 mypy==1.18.2
-pyright==1.1.406
+pyright==1.1.407
 
 # Libraries used by our various scripts.
 aiohttp==3.12.15
@@ -19,7 +19,7 @@ termcolor>=2.3
 tomli==2.2.1; python_version < "3.11"
 tomlkit==0.13.3
 typing_extensions>=4.15.0rc1
-uv==0.8.22
+uv==0.9.6
 
 # Utilities for typeshed infrastructure scripts.
 ts_utils @ file:lib

scripts/stubsabot.py

@@ -161,7 +161,7 @@ def __str__(self) -> str:
 @dataclass
 class Remove:
     distribution: str
-    reason: str
+    reason: Literal["ships py.typed file", "unmaintained"]
     links: dict[str, str]
 
     def __str__(self) -> str:
@@ -171,7 +171,7 @@ def __str__(self) -> str:
 @dataclass
 class NoUpdate:
     distribution: str
-    reason: str
+    reason: Literal["obsolete", "no longer updated", "up to date"]
 
     def __str__(self) -> str:
         return f"{colored('skipping', 'green')} ({self.reason})"
@@ -642,7 +642,7 @@ async def determine_action_no_error_handling(
                 "Typeshed release": f"{pypi_info.pypi_root}",
                 "Typeshed stubs": f"https://github.com/{TYPESHED_OWNER}/typeshed/tree/main/stubs/{stub_info.distribution}",
             }
-            return Remove(stub_info.distribution, reason="older than 6 months", links=links)
+            return Remove(stub_info.distribution, reason="ships py.typed file", links=links)
         else:
             return NoUpdate(stub_info.distribution, "obsolete")
     if stub_info.no_longer_updated:
@@ -654,7 +654,7 @@ async def determine_action_no_error_handling(
                 "Typeshed release": f"{pypi_info.pypi_root}",
                 "Typeshed stubs": f"https://github.com/{TYPESHED_OWNER}/typeshed/tree/main/stubs/{stub_info.distribution}",
             }
-            return Remove(stub_info.distribution, reason="no longer updated", links=links)
+            return Remove(stub_info.distribution, reason="unmaintained", links=links)
         else:
             return NoUpdate(stub_info.distribution, "no longer updated")
 

stdlib/@tests/stubtest_allowlists/common.txt

@@ -170,6 +170,10 @@ sys.ps1  # Available in interactive mode
 sys.ps2  # Available in interactive mode
 sys.tracebacklimit  # Must be set first
 
+# This is only present if Python was built with zlib-ng.
+(zlib\.ZLIBNG_VERSION)?
+(compression\.zlib\.ZLIBNG_VERSION)?
+
 
 # ==========================================================
 # Other allowlist entries that cannot or should not be fixed
@@ -233,7 +237,6 @@ asyncio.locks.Condition.release
 builtins.memoryview.__contains__  # C type that implements __getitem__
 builtins.reveal_locals  # Builtins that type checkers pretends exist
 builtins.reveal_type  # Builtins that type checkers pretends exist
-builtins.type.__dict__  # read-only but not actually a property; stubtest thinks it's a mutable attribute.
 
 # The following CodecInfo properties are added in __new__
 codecs.CodecInfo.decode

stdlib/@tests/stubtest_allowlists/darwin-py313.txt

@@ -3,3 +3,10 @@
 # =======
 
 (mmap.MAP_32BIT)?  # Exists locally on MacOS but not on GitHub
+
+# ================
+# Unclear problems
+# ================
+
+# Added in 3.11.1, flagged by stubtest on Python < 3.14 for unknown reasons
+errno.ENOTCAPABLE

stdlib/@tests/stubtest_allowlists/linux-py39.txt

@@ -6,6 +6,12 @@
 # while being inspected by stubtest. Fixed in Python 3.10.
 select.epoll.register
 
+# According to stubtest, these are sometimes not present at runtime, starting
+# with Python 3.9.24. Which is not true.
+(_frozen_importlib_external.PathFinder.find_distributions)?
+(importlib._bootstrap_external.PathFinder.find_distributions)?
+(importlib.machinery.PathFinder.find_distributions)?
+
 
 # =============================================================
 # Allowlist entries that cannot or should not be fixed; <= 3.12

stdlib/@tests/test_cases/builtins/check_type.py

@@ -0,0 +1,4 @@
+class Meta(type): ...
+
+
+call = Meta.__dict__["__call__"]

stdlib/builtins.pyi

@@ -42,6 +42,7 @@ from typing import (  # noqa: Y022,UP035
     Any,
     BinaryIO,
     ClassVar,
+    Final,
     Generic,
     Mapping,
     MutableMapping,
@@ -189,8 +190,9 @@ class type:
     __bases__: tuple[type, ...]
     @property
     def __basicsize__(self) -> int: ...
-    @property
-    def __dict__(self) -> types.MappingProxyType[str, Any]: ...  # type: ignore[override]
+    # type.__dict__ is read-only at runtime, but that can't be expressed currently.
+    # See https://github.com/python/typeshed/issues/11033 for a discussion.
+    __dict__: Final[types.MappingProxyType[str, Any]]  # type: ignore[assignment]
     @property
     def __dictoffset__(self) -> int: ...
     @property
@@ -2058,6 +2060,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]

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]: ...