Merge branch 'main' into tkinter-remove-typealiases

donbarbos · web-flow · commit 02b21460209d · 2025-09-21T12:14:46.000+04:00
diff --git a/pyrightconfig.stricter.json b/pyrightconfig.stricter.json
@@ -92,6 +92,7 @@
         "stubs/tqdm",
         "stubs/vobject",
         "stubs/workalendar",
+        "stubs/xmltodict",
     ],
     "typeCheckingMode": "strict",
     // TODO: Complete incomplete stubs
diff --git a/stdlib/@tests/stubtest_allowlists/common.txt b/stdlib/@tests/stubtest_allowlists/common.txt
@@ -181,6 +181,12 @@ _collections_abc.AsyncGenerator.__anext__
 _collections_abc.AsyncGenerator.aclose
 _collections_abc.AsyncIterator.__anext__
 
+# Pretend typing.ByteString is a Union, to better match its documented semantics.
+# As a side effect, this changes the definition of collections.abc.ByteString, which is okay,
+# because it's not an ABC that makes any sense and was deprecated in 3.12
+_collections_abc\.ByteString
+typing\.ByteString
+
 _collections_abc.Callable  # Typing-related weirdness
 _collections_abc.Mapping.get  # Adding None to the Union messed up mypy
 _collections_abc.Sequence.index  # Supporting None in end is not mandatory
diff --git a/stdlib/@tests/stubtest_allowlists/darwin-py311.txt b/stdlib/@tests/stubtest_allowlists/darwin-py311.txt
@@ -29,3 +29,11 @@ _msi
 msilib(.[a-z]+)?
 ossaudiodev
 spwd
+
+
+# ================
+# Unclear problems
+# ================
+
+# Added in 3.11.1, flagged by stubtest on Python < 3.14 for unknown reasons
+errno.ENOTCAPABLE
diff --git a/stdlib/@tests/stubtest_allowlists/darwin-py312.txt b/stdlib/@tests/stubtest_allowlists/darwin-py312.txt
@@ -17,3 +17,11 @@ _msi
 msilib(.[a-z]+)?
 ossaudiodev
 spwd
+
+
+# ================
+# Unclear problems
+# ================
+
+# Added in 3.11.1, flagged by stubtest on Python < 3.14 for unknown reasons
+errno.ENOTCAPABLE
diff --git a/stdlib/@tests/stubtest_allowlists/darwin-py313.txt b/stdlib/@tests/stubtest_allowlists/darwin-py313.txt
@@ -3,3 +3,11 @@
 # =======
 
 (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
diff --git a/stdlib/@tests/stubtest_allowlists/py310.txt b/stdlib/@tests/stubtest_allowlists/py310.txt
@@ -155,19 +155,12 @@ tkinter.tix.TkVersion
 # <= 3.13
 # =======
 
-# Pretend typing.ByteString is a Union, to better match its documented semantics.
-# As a side effect, this changes the definition of collections.abc.ByteString, which is okay,
-# because it's not an ABC that makes any sense and was deprecated in 3.12
-_collections_abc.ByteString
-
 ast.Ellipsis.__new__  # Implementation has *args, but shouldn't allow any
 
 _?hashlib.scrypt  # Raises TypeError if salt, n, r or p are None
 
 importlib.abc.Traversable.open  # Problematic protocol signature at runtime, see source code comments.
 
-typing\.ByteString
-
 # Will always raise. Not included to avoid type checkers inferring that
 # TypeAliasType instances are callable.
 typing_extensions.TypeAliasType.__call__
diff --git a/stdlib/@tests/stubtest_allowlists/py311.txt b/stdlib/@tests/stubtest_allowlists/py311.txt
@@ -121,19 +121,12 @@ tkinter.tix.TkVersion
 # <= 3.13
 # =======
 
-# Pretend typing.ByteString is a Union, to better match its documented semantics.
-# As a side effect, this changes the definition of collections.abc.ByteString, which is okay,
-# because it's not an ABC that makes any sense and was deprecated in 3.12
-_collections_abc.ByteString
-
 ast.Ellipsis.__new__  # Implementation has *args, but shouldn't allow any
 
 _?hashlib.scrypt  # Raises TypeError if salt, n, r or p are None
 
 importlib.abc.Traversable.open  # Problematic protocol signature at runtime, see source code comments.
 
-typing\.ByteString
-
 # Will always raise. Not included to avoid type checkers inferring that
 # TypeAliasType instances are callable.
 typing_extensions.TypeAliasType.__call__
diff --git a/stdlib/@tests/stubtest_allowlists/py312.txt b/stdlib/@tests/stubtest_allowlists/py312.txt
@@ -120,19 +120,12 @@ tkinter.tix.TkVersion
 # <= 3.13
 # =======
 
-# Pretend typing.ByteString is a Union, to better match its documented semantics.
-# As a side effect, this changes the definition of collections.abc.ByteString, which is okay,
-# because it's not an ABC that makes any sense and was deprecated in 3.12
-_collections_abc.ByteString
-
 ast.Ellipsis.__new__  # Implementation has *args, but shouldn't allow any
 
 _?hashlib.scrypt  # Raises TypeError if salt, n, r or p are None
 
 importlib.abc.Traversable.open  # Problematic protocol signature at runtime, see source code comments.
 
-typing\.ByteString
-
 # Will always raise. Not included to avoid type checkers inferring that
 # TypeAliasType instances are callable.
 typing_extensions.TypeAliasType.__call__
diff --git a/stdlib/@tests/stubtest_allowlists/py313.txt b/stdlib/@tests/stubtest_allowlists/py313.txt
@@ -81,19 +81,12 @@ typing(_extensions)?\.IO\.writelines
 # <= 3.13
 # =======
 
-# Pretend typing.ByteString is a Union, to better match its documented semantics.
-# As a side effect, this changes the definition of collections.abc.ByteString, which is okay,
-# because it's not an ABC that makes any sense and was deprecated in 3.12
-_collections_abc.ByteString
-
 ast.Ellipsis.__new__  # Implementation has *args, but shouldn't allow any
 
 _?hashlib.scrypt  # Raises TypeError if salt, n, r or p are None
 
 importlib.abc.Traversable.open  # Problematic protocol signature at runtime, see source code comments.
 
-typing\.ByteString
-
 # Will always raise. Not included to avoid type checkers inferring that
 # TypeAliasType instances are callable.
 typing_extensions.TypeAliasType.__call__
diff --git a/stdlib/@tests/stubtest_allowlists/py39.txt b/stdlib/@tests/stubtest_allowlists/py39.txt
@@ -18,7 +18,7 @@ collections.AsyncGenerator.__anext__  # async at runtime, deliberately not in th
 collections.AsyncGenerator.aclose  # async at runtime, deliberately not in the stub, see #7491
 collections.AsyncGenerator.asend  # async at runtime, deliberately not in the stub, see #7491. Pos-only differences also.
 collections.AsyncIterator.__anext__  # async at runtime, deliberately not in the stub, see #7491
-collections.ByteString  # see comments in py3_common.txt
+collections.ByteString  # see comments in common.txt
 collections.Callable
 collections.Mapping.get  # Adding None to the Union messed up mypy
 collections.Sequence.index  # Supporting None in end is not mandatory
@@ -104,19 +104,12 @@ tkinter.tix.TkVersion
 # <= 3.13
 # =======
 
-# Pretend typing.ByteString is a Union, to better match its documented semantics.
-# As a side effect, this changes the definition of collections.abc.ByteString, which is okay,
-# because it's not an ABC that makes any sense and was deprecated in 3.12
-_collections_abc.ByteString
-
 ast.Ellipsis.__new__  # Implementation has *args, but shouldn't allow any
 
 _?hashlib.scrypt  # Raises TypeError if salt, n, r or p are None
 
 importlib.abc.Traversable.open  # Problematic protocol signature at runtime, see source code comments.
 
-typing\.ByteString
-
 # Will always raise. Not included to avoid type checkers inferring that
 # TypeAliasType instances are callable.
 typing_extensions.TypeAliasType.__call__
diff --git a/stdlib/_collections_abc.pyi b/stdlib/_collections_abc.pyi
@@ -1,12 +1,13 @@
 import sys
 from abc import abstractmethod
 from types import MappingProxyType
-from typing import (  # noqa: Y022,Y038,UP035
+from typing import (  # noqa: Y022,Y038,UP035,Y057
     AbstractSet as Set,
     AsyncGenerator as AsyncGenerator,
     AsyncIterable as AsyncIterable,
     AsyncIterator as AsyncIterator,
     Awaitable as Awaitable,
+    ByteString as ByteString,
     Callable as Callable,
     ClassVar,
     Collection as Collection,
@@ -59,12 +60,8 @@ __all__ = [
     "ValuesView",
     "Sequence",
     "MutableSequence",
+    "ByteString",
 ]
-if sys.version_info < (3, 14):
-    from typing import ByteString as ByteString  # noqa: Y057,UP035
-
-    __all__ += ["ByteString"]
-
 if sys.version_info >= (3, 12):
     __all__ += ["Buffer"]
 
diff --git a/stdlib/asyncio/tools.pyi b/stdlib/asyncio/tools.pyi
@@ -1,3 +1,4 @@
+import sys
 from collections.abc import Iterable
 from enum import Enum
 from typing import NamedTuple, SupportsIndex, type_check_only
@@ -37,5 +38,9 @@ class CycleFoundException(Exception):
 def get_all_awaited_by(pid: SupportsIndex) -> list[_AwaitedInfo]: ...
 def build_async_tree(result: Iterable[_AwaitedInfo], task_emoji: str = "(T)", cor_emoji: str = "") -> list[list[str]]: ...
 def build_task_table(result: Iterable[_AwaitedInfo]) -> list[list[int | str]]: ...
+
+if sys.version_info >= (3, 14):
+    def exit_with_permission_help_text() -> None: ...
+
 def display_awaited_by_tasks_table(pid: SupportsIndex) -> None: ...
 def display_awaited_by_tasks_tree(pid: SupportsIndex) -> None: ...
diff --git a/stdlib/concurrent/interpreters/_queues.pyi b/stdlib/concurrent/interpreters/_queues.pyi
@@ -45,14 +45,30 @@ if sys.version_info >= (3, 13):  # needed to satisfy pyright checks for Python <
         def empty(self) -> bool: ...
         def full(self) -> bool: ...
         def qsize(self) -> int: ...
-        def put(
-            self,
-            obj: object,
-            timeout: SupportsIndex | None = None,
-            *,
-            unbounditems: _AnyUnbound | None = None,
-            _delay: float = 0.01,
-        ) -> None: ...
+        if sys.version_info >= (3, 14):
+            def put(
+                self,
+                obj: object,
+                block: bool = True,
+                timeout: SupportsIndex | None = None,
+                *,
+                unbounditems: _AnyUnbound | None = None,
+                _delay: float = 0.01,
+            ) -> None: ...
+        else:
+            def put(
+                self,
+                obj: object,
+                timeout: SupportsIndex | None = None,
+                *,
+                unbounditems: _AnyUnbound | None = None,
+                _delay: float = 0.01,
+            ) -> None: ...
+
         def put_nowait(self, obj: object, *, unbounditems: _AnyUnbound | None = None) -> None: ...
-        def get(self, timeout: SupportsIndex | None = None, *, _delay: float = 0.01) -> object: ...
+        if sys.version_info >= (3, 14):
+            def get(self, block: bool = True, timeout: SupportsIndex | None = None, *, _delay: float = 0.01) -> object: ...
+        else:
+            def get(self, timeout: SupportsIndex | None = None, *, _delay: float = 0.01) -> object: ...
+
         def get_nowait(self) -> object: ...
diff --git a/stdlib/errno.pyi b/stdlib/errno.pyi
@@ -121,6 +121,7 @@ if sys.platform == "darwin":
     ESHLIBVERS: Final[int]
     if sys.version_info >= (3, 11):
         EQFULL: Final[int]
+        ENOTCAPABLE: Final[int]  # available starting with 3.11.1
 
 if sys.platform != "darwin":
     EDEADLOCK: Final[int]
diff --git a/stdlib/typing.pyi b/stdlib/typing.pyi
@@ -41,6 +41,7 @@ __all__ = [
     "AsyncIterator",
     "Awaitable",
     "BinaryIO",
+    "ByteString",
     "Callable",
     "ChainMap",
     "ClassVar",
@@ -109,9 +110,6 @@ __all__ = [
     "runtime_checkable",
 ]
 
-if sys.version_info < (3, 14):
-    __all__ += ["ByteString"]
-
 if sys.version_info >= (3, 14):
     __all__ += ["evaluate_forward_ref"]
 
@@ -923,8 +921,7 @@ class TextIO(IO[str]):
     @abstractmethod
     def __enter__(self) -> TextIO: ...
 
-if sys.version_info < (3, 14):
-    ByteString: typing_extensions.TypeAlias = bytes | bytearray | memoryview
+ByteString: typing_extensions.TypeAlias = bytes | bytearray | memoryview
 
 # Functions
 
diff --git a/stubs/Authlib/METADATA.toml b/stubs/Authlib/METADATA.toml
@@ -1,4 +1,4 @@
-version = "~= 1.6.2"
+version = "~= 1.6.4"
 upstream_repository = "https://github.com/lepture/authlib"
 requires = ["cryptography"]
 partial_stub = true
diff --git a/stubs/Authlib/authlib/jose/errors.pyi b/stubs/Authlib/authlib/jose/errors.pyi
@@ -22,6 +22,10 @@ class InvalidHeaderParameterNameError(JoseError):
     error: str
     def __init__(self, name) -> None: ...
 
+class InvalidCritHeaderParameterNameError(JoseError):
+    error: str
+    def __init__(self, name: str) -> None: ...
+
 class InvalidEncryptionAlgorithmForECDH1PUWithKeyWrappingError(JoseError):
     error: str
     def __init__(self) -> None: ...
diff --git a/stubs/Authlib/authlib/oauth1/client.pyi b/stubs/Authlib/authlib/oauth1/client.pyi
@@ -1,4 +1,5 @@
 from _typeshed import Incomplete
+from typing import Any
 
 from authlib.oauth1 import ClientAuth
 
@@ -31,7 +32,7 @@ class OAuth1Client:
     @token.setter
     def token(self, token) -> None: ...
     def create_authorization_url(self, url, request_token=None, **kwargs): ...
-    def fetch_request_token(self, url, **kwargs): ...
+    def fetch_request_token(self, url: str, **kwargs) -> dict[str, Any]: ...
     def fetch_access_token(self, url, verifier=None, **kwargs): ...
     def parse_authorization_response(self, url): ...
     def parse_response_token(self, status_code, text): ...
diff --git a/stubs/gdb/gdb/__init__.pyi b/stubs/gdb/gdb/__init__.pyi
@@ -960,7 +960,7 @@ class ExitedEvent(Event):
     exit_code: int
     inferior: Inferior
 
-class ThreadExitedEvent(Event): ...
+class ThreadExitedEvent(ThreadEvent): ...
 
 class StopEvent(ThreadEvent):
     details: dict[str, object]
diff --git a/stubs/pyserial/@tests/stubtest_allowlist_win32.txt b/stubs/pyserial/@tests/stubtest_allowlist_win32.txt
@@ -11,6 +11,6 @@ serial.tools.list_ports_posix  # Posix only
 # names.
 serial.serialwin32.Serial.write
 
-# FIXME: new stubtest errors from mypy v1.18.1 that need to be looked at more closely.
-# See https://github.com/python/typeshed/pull/14699
+# Depending on the Windows variant, ULONG_PTR is either c_longlong or c_ulong,
+# but when running stubtest, only one of these is seen.
 serial.win32.ULONG_PTR
diff --git a/stubs/regex/METADATA.toml b/stubs/regex/METADATA.toml
@@ -1,2 +1,2 @@
-version = "2025.9.1"
+version = "2025.9.18"
 upstream_repository = "https://github.com/mrabarnett/mrab-regex"
diff --git a/stubs/xmltodict/METADATA.toml b/stubs/xmltodict/METADATA.toml
@@ -1,2 +1,2 @@
-version = "0.15.*"
+version = "~= 1.0.1"
 upstream_repository = "https://github.com/martinblech/xmltodict"
diff --git a/stubs/xmltodict/xmltodict.pyi b/stubs/xmltodict/xmltodict.pyi
