Merge branch 'main' into colour-stubs

Author: absolutely-vivid

CONTRIBUTING.md

@@ -187,8 +187,8 @@ supported:
   uploads to PyPI. This should only be used in special cases, e.g. when the stubs
   break the upload.
 * `partial-stub` (optional): This field marks the type stub package as
-  [partial](https://peps.python.org/pep-0561/#partial-stub-packages). This is for
-  3rd-party stubs that don't cover the entirety of the package's public API.
+  [partial](https://typing.python.org/en/latest/spec/distributing.html#partial-stub-packages).
+  This is for 3rd-party stubs that don't cover the entirety of the package's public API.
 * `requires-python` (optional): The minimum version of Python required to install
   the type stub package. It must be in the form `>=3.*`. If omitted, the oldest
   Python version supported by typeshed is used.
@@ -441,7 +441,7 @@ these steps:
 
 1. Open an issue explaining why the stubs should be removed.
 2. A maintainer will add the
-   ["stubs: removal" label](https://github.com/python/typeshed/labels/%22stubs%3A%20removal%22).
+   ["stubs: removal" label](https://github.com/python/typeshed/labels/stubs%3A%20removal).
 3. Open a PR that sets the `no-longer-updated` field in the `METADATA.toml`
    file to `true`.
 4. When a new version of the package was automatically uploaded to PyPI (which
@@ -452,7 +452,7 @@ for any stub obsoletions or removals.
 
 ### Marking PRs as "deferred"
 
-We sometimes use the ["status: deferred" label](https://github.com/python/typeshed/labels/%22status%3A%20deferred%22)
+We sometimes use the ["status: deferred" label](https://github.com/python/typeshed/labels/status%3A%20deferred)
 to mark PRs and issues that we'd like to accept, but that are blocked by some
 external factor. Blockers can include:
 

pyproject.toml

@@ -11,9 +11,28 @@ target-version = ["py310"]
 skip-magic-trailing-comma = true
 preview = true
 
+# Override `exclude` so that the `stdlib/venv` directory is not excluded
+# if you invoke Black "manually" (not using pre-commit). `venv` is one of
+# the directories that Black excludes by default if `tool.black.exclude`
+# is not set. See https://black.readthedocs.io/en/stable/usage_and_configuration/the_basics.html#exclude
+exclude = '''
+/(
+    \.env|
+    \.venv|
+    env|
+    \.git|
+    \.mypy_cache
+)/
+'''
+
 [tool.ruff]
 line-length = 130
 fix = true
+
+# Override `exclude` so that the `stdlib/venv` directory is not excluded
+# if you invoke Ruff "manually" (not using pre-commit). `venv` is one of
+# the directories that Ruff excludes by default if `tool.ruff.exclude`
+# is not set. See https://docs.astral.sh/ruff/configuration/
 exclude = [
     # virtual environment
     ".env",

pyrightconfig.stricter.json

@@ -56,6 +56,7 @@
         "stubs/icalendar/icalendar/timezone/provider.pyi",
         "stubs/jsonschema",
         "stubs/jwcrypto",
+        "stubs/kafka-python",
         "stubs/ldap3",
         "stubs/m3u8/m3u8/model.pyi",
         "stubs/Markdown",
@@ -78,7 +79,6 @@
         "stubs/psutil/psutil/__init__.pyi",
         "stubs/psycopg2",
         "stubs/pyasn1",
-        "stubs/pycurl",
         "stubs/Pygments",
         "stubs/PyMySQL",
         "stubs/python-jose",

requirements-tests.txt

@@ -1,10 +1,10 @@
 # Type checkers that we test our stubs against. These should always
 # be pinned to a specific version to make failure reproducible.
 mypy==2.1.0
-pyright==1.1.409
+pyright==1.1.410
 
 # Libraries used by our various scripts.
-aiohttp==3.13.5
+aiohttp==3.14.1
 grpcio-tools>=1.76.0; python_version < "3.15" # For grpc_tools.protoc
 mypy-protobuf==5.0.0; python_version < "3.15"
 packaging==26.0
@@ -18,7 +18,7 @@ termcolor>=2.3
 tomli==2.4.1; python_version < "3.11"
 tomlkit==0.14.0
 typing_extensions>=4.15.0rc1
-uv==0.11.6
+uv==0.11.15
 
 # Utilities for typeshed infrastructure scripts.
 ts_utils @ file:lib

scripts/stubsabot.py

@@ -715,7 +715,7 @@ def get_origin_owner() -> str:
     output = subprocess.check_output(["git", "remote", "get-url", "origin"], text=True).strip()
     match = re.match(r"(git@github.com:|https://github.com/)(?P<owner>[^/]+)/(?P<repo>[^/\s]+)", output)
     assert match is not None, f"Couldn't identify origin's owner: {output!r}"
-    assert match.group("repo").removesuffix(".git") == "typeshed", f'Unexpected repo: {match.group("repo")!r}'
+    assert match.group("repo").removesuffix(".git") == "typeshed", f"Unexpected repo: {match.group('repo')!r}"
     return match.group("owner")
 
 
@@ -965,7 +965,7 @@ async def main() -> int:
     if args.distributions:
         dists_to_update = args.distributions
     else:
-        dists_to_update = [path.name for path in STUBS_PATH.iterdir()]
+        dists_to_update = sorted(path.name for path in STUBS_PATH.iterdir())
 
     if args.action_level > ActionLevel.nothing:
         subprocess.run(["git", "update-index", "--refresh"], capture_output=True, check=False)

stdlib/@tests/stubtest_allowlists/common.txt

@@ -236,8 +236,11 @@ _?ctypes.Union.__getattr__  # doesn't exist, but makes things easy if we pretend
 _?ctypes.Union.__setattr__  # doesn't exist, but makes things easy if we pretend it does
 
 # Iterable classes that don't define __iter__ at runtime (usually iterable via __getitem__)
-# These would ideally be special-cased by type checkers; see https://github.com/python/mypy/issues/2220
+# These would ideally be special-cased by type checkers.
+# See https://github.com/python/mypy/issues/2220 and https://github.com/python/typeshed/issues/7813
 _?ctypes.Array.__iter__
+calendar._localized_day.__iter__
+calendar._localized_month.__iter__
 
 dataclasses.KW_ONLY  # white lies around defaults
 

stdlib/@tests/stubtest_allowlists/linux.txt

@@ -29,11 +29,78 @@ select.poll  # Actually a function; we have a class so it can be used as a type
 # Bluetooth constants which aren't on the GitHub Actions runners, see #15207
 (_?socket\.AF_BLUETOOTH)?
 (_?socket\.BDADDR_ANY)?
+(_?socket\.BDADDR_BREDR)?
+(_?socket\.BDADDR_LE_PUBLIC)?
+(_?socket\.BDADDR_LE_RANDOM)?
 (_?socket\.BDADDR_LOCAL)?
+(_?socket\.BT_CHANNEL_POLICY)?
+(_?socket\.BT_CHANNEL_POLICY_BREDR_ONLY)?
+(_?socket\.BT_CHANNEL_POLICY_BREDR_PREFERRED)?
+(_?socket\.BT_CODEC)?
+(_?socket\.BT_DEFER_SETUP)?
+(_?socket\.BT_FLUSHABLE)?
+(_?socket\.BT_FLUSHABLE_OFF)?
+(_?socket\.BT_FLUSHABLE_ON)?
+(_?socket\.BT_ISO_QOS)?
+(_?socket\.BT_MODE)?
+(_?socket\.BT_MODE_BASIC)?
+(_?socket\.BT_MODE_ERTM)?
+(_?socket\.BT_MODE_EXT_FLOWCTL)?
+(_?socket\.BT_MODE_LE_FLOWCTL)?
+(_?socket\.BT_MODE_STREAMING)?
+(_?socket\.BT_PHY)?
+(_?socket\.BT_PHY_BR_1M_1SLOT)?
+(_?socket\.BT_PHY_BR_1M_3SLOT)?
+(_?socket\.BT_PHY_BR_1M_5SLOT)?
+(_?socket\.BT_PHY_EDR_2M_1SLOT)?
+(_?socket\.BT_PHY_EDR_2M_3SLOT)?
+(_?socket\.BT_PHY_EDR_2M_5SLOT)?
+(_?socket\.BT_PHY_EDR_3M_1SLOT)?
+(_?socket\.BT_PHY_EDR_3M_3SLOT)?
+(_?socket\.BT_PHY_EDR_3M_5SLOT)?
+(_?socket\.BT_PHY_LE_1M_RX)?
+(_?socket\.BT_PHY_LE_1M_TX)?
+(_?socket\.BT_PHY_LE_2M_RX)?
+(_?socket\.BT_PHY_LE_2M_TX)?
+(_?socket\.BT_PHY_LE_CODED_RX)?
+(_?socket\.BT_PHY_LE_CODED_TX)?
+(_?socket\.BT_PKT_STATUS)?
+(_?socket\.BT_POWER)?
+(_?socket\.BT_POWER_FORCE_ACTIVE_OFF)?
+(_?socket\.BT_POWER_FORCE_ACTIVE_ON)?
+(_?socket\.BT_RCVMTU)?
+(_?socket\.BT_SECURITY)?
+(_?socket\.BT_SECURITY_FIPS)?
+(_?socket\.BT_SECURITY_HIGH)?
+(_?socket\.BT_SECURITY_LOW)?
+(_?socket\.BT_SECURITY_MEDIUM)?
+(_?socket\.BT_SECURITY_SDP)?
+(_?socket\.BT_SNDMTU)?
+(_?socket\.BT_VOICE)?
+(_?socket\.BT_VOICE_CVSD_16BIT)?
+(_?socket\.BT_VOICE_TRANSPARENT)?
+(_?socket\.BT_VOICE_TRANSPARENT_16BIT)?
 (_?socket\.BTPROTO_HCI)?
 (_?socket\.BTPROTO_L2CAP)?
 (_?socket\.BTPROTO_RFCOMM)?
 (_?socket\.BTPROTO_SCO)?
+(_?socket\.HCI_CHANNEL_CONTROL)?
+(_?socket\.HCI_CHANNEL_LOGGING)?
+(_?socket\.HCI_CHANNEL_MONITOR)?
+(_?socket\.HCI_CHANNEL_RAW)?
+(_?socket\.HCI_CHANNEL_USER)?
+(_?socket\.HCI_DEV_NONE)?
+(_?socket\.L2CAP_LM)?
+(_?socket\.L2CAP_LM_AUTH)?
+(_?socket\.L2CAP_LM_ENCRYPT)?
+(_?socket\.L2CAP_LM_MASTER)?
+(_?socket\.L2CAP_LM_RELIABLE)?
+(_?socket\.L2CAP_LM_SECURE)?
+(_?socket\.L2CAP_LM_TRUSTED)?
+(_?socket\.SOL_BLUETOOTH)?
+(_?socket\.SOL_L2CAP)?
+(_?socket\.SOL_RFCOMM)?
+(_?socket\.SOL_SCO)?
 
 # These seem like they should be available on Linux, but they're not
 # on GitHub Actions runners for some reason.

stdlib/_asyncio.pyi

@@ -99,7 +99,7 @@ class Task(Future[_T_co]):  # type: ignore[type-var]  # pyright: ignore[reportIn
 def get_event_loop() -> AbstractEventLoop: ...
 def get_running_loop() -> AbstractEventLoop: ...
 def _set_running_loop(loop: AbstractEventLoop | None, /) -> None: ...
-def _get_running_loop() -> AbstractEventLoop: ...
+def _get_running_loop() -> AbstractEventLoop | None: ...
 def _register_task(task: Task[Any]) -> None: ...
 def _unregister_task(task: Task[Any]) -> None: ...
 def _enter_task(loop: AbstractEventLoop, task: Task[Any]) -> None: ...

stdlib/_msi.pyi

@@ -52,7 +52,7 @@ if sys.platform == "win32":
         __init__: None  # type: ignore[assignment]
 
     def UuidCreate() -> str: ...
-    def FCICreate(cabname: str, files: list[str], /) -> None: ...
+    def FCICreate(cabname: str, files: list[tuple[str, str]], /) -> None: ...
     def OpenDatabase(path: str, persist: int, /) -> _Database: ...
     def CreateRecord(count: int, /) -> _Record: ...
 

stdlib/_socket.pyi

@@ -11,7 +11,11 @@ _CMSGArg: TypeAlias = tuple[int, int, ReadableBuffer]
 # Addresses can be either tuples of varying lengths (AF_INET, AF_INET6,
 # AF_NETLINK, AF_TIPC) or strings/buffers (AF_UNIX).
 # See getsockaddrarg() in socketmodule.c.
-_Address: TypeAlias = tuple[Any, ...] | str | ReadableBuffer
+if sys.version_info >= (3, 14):
+    # A bare int is accepted for Bluetooth HCI device IDs.
+    _Address: TypeAlias = tuple[Any, ...] | str | ReadableBuffer | int
+else:
+    _Address: TypeAlias = tuple[Any, ...] | str | ReadableBuffer
 _RetAddress: TypeAlias = Any
 
 # ===== Constants =====
@@ -250,8 +254,75 @@ if sys.version_info >= (3, 14):
         TCP_QUICKACK: Final[int]
 
     if sys.platform == "linux":
+        BDADDR_BREDR: Final[int]
+        BDADDR_LE_PUBLIC: Final[int]
+        BDADDR_LE_RANDOM: Final[int]
+        BT_CHANNEL_POLICY: Final[int]
+        BT_CHANNEL_POLICY_BREDR_ONLY: Final[int]
+        BT_CHANNEL_POLICY_BREDR_PREFERRED: Final[int]
+        BT_CODEC: Final[int]
+        BT_DEFER_SETUP: Final[int]
+        BT_FLUSHABLE: Final[int]
+        BT_FLUSHABLE_OFF: Final[int]
+        BT_FLUSHABLE_ON: Final[int]
+        BT_ISO_QOS: Final[int]
+        BT_MODE: Final[int]
+        BT_MODE_BASIC: Final[int]
+        BT_MODE_ERTM: Final[int]
+        BT_MODE_EXT_FLOWCTL: Final[int]
+        BT_MODE_LE_FLOWCTL: Final[int]
+        BT_MODE_STREAMING: Final[int]
+        BT_PHY: Final[int]
+        BT_PHY_BR_1M_1SLOT: Final[int]
+        BT_PHY_BR_1M_3SLOT: Final[int]
+        BT_PHY_BR_1M_5SLOT: Final[int]
+        BT_PHY_EDR_2M_1SLOT: Final[int]
+        BT_PHY_EDR_2M_3SLOT: Final[int]
+        BT_PHY_EDR_2M_5SLOT: Final[int]
+        BT_PHY_EDR_3M_1SLOT: Final[int]
+        BT_PHY_EDR_3M_3SLOT: Final[int]
+        BT_PHY_EDR_3M_5SLOT: Final[int]
+        BT_PHY_LE_1M_RX: Final[int]
+        BT_PHY_LE_1M_TX: Final[int]
+        BT_PHY_LE_2M_RX: Final[int]
+        BT_PHY_LE_2M_TX: Final[int]
+        BT_PHY_LE_CODED_RX: Final[int]
+        BT_PHY_LE_CODED_TX: Final[int]
+        BT_PKT_STATUS: Final[int]
+        BT_POWER: Final[int]
+        BT_POWER_FORCE_ACTIVE_OFF: Final[int]
+        BT_POWER_FORCE_ACTIVE_ON: Final[int]
+        BT_RCVMTU: Final[int]
+        BT_SECURITY: Final[int]
+        BT_SECURITY_FIPS: Final[int]
+        BT_SECURITY_HIGH: Final[int]
+        BT_SECURITY_LOW: Final[int]
+        BT_SECURITY_MEDIUM: Final[int]
+        BT_SECURITY_SDP: Final[int]
+        BT_SNDMTU: Final[int]
+        BT_VOICE: Final[int]
+        BT_VOICE_CVSD_16BIT: Final[int]
+        BT_VOICE_TRANSPARENT: Final[int]
+        BT_VOICE_TRANSPARENT_16BIT: Final[int]
+        HCI_CHANNEL_CONTROL: Final[int]
+        HCI_CHANNEL_LOGGING: Final[int]
+        HCI_CHANNEL_MONITOR: Final[int]
+        HCI_CHANNEL_RAW: Final[int]
+        HCI_CHANNEL_USER: Final[int]
+        HCI_DEV_NONE: Final[int]
         IP_FREEBIND: Final[int]
         IP_RECVORIGDSTADDR: Final[int]
+        L2CAP_LM: Final[int]
+        L2CAP_LM_AUTH: Final[int]
+        L2CAP_LM_ENCRYPT: Final[int]
+        L2CAP_LM_MASTER: Final[int]
+        L2CAP_LM_RELIABLE: Final[int]
+        L2CAP_LM_SECURE: Final[int]
+        L2CAP_LM_TRUSTED: Final[int]
+        SOL_BLUETOOTH: Final[int]
+        SOL_L2CAP: Final[int]
+        SOL_RFCOMM: Final[int]
+        SOL_SCO: Final[int]
         VMADDR_CID_LOCAL: Final[int]
 
 if sys.platform != "win32" and sys.platform != "darwin":