Merge branch 'main' into collections_abc_positional_only

Author: randolf-scholz

stdlib/@tests/stubtest_allowlists/py314.txt

@@ -1,18 +1,3 @@
-# ====================================================================
-# TODO: New errors in Python 3.14 that need to be fixed or moved below
-# ====================================================================
-
-multiprocessing.managers.BaseListProxy.clear
-# inspect.signature gives the wrong signature
-multiprocessing.managers.BaseListProxy.copy
-multiprocessing.managers.DictProxy.__ior__
-multiprocessing.managers._BaseDictProxy.__ior__
-multiprocessing.managers._BaseDictProxy.__or__
-multiprocessing.managers._BaseDictProxy.__reversed__
-multiprocessing.managers._BaseDictProxy.__ror__
-multiprocessing.managers._BaseDictProxy.fromkeys
-
-
 # =========================
 # New errors in Python 3.14
 # =========================
@@ -100,6 +85,9 @@ multiprocessing.managers._BaseSetProxy.__len__
 multiprocessing.managers._BaseSetProxy.clear
 multiprocessing.managers._BaseSetProxy.copy
 multiprocessing.managers._BaseSetProxy.pop
+multiprocessing.managers.BaseListProxy.clear
+multiprocessing.managers.BaseListProxy.copy
+multiprocessing.managers._BaseDictProxy.__reversed__
 
 
 # =============================================================

stdlib/@tests/test_cases/check_logging.py

@@ -28,3 +28,27 @@ def record_factory(*args: Any, **kwargs: Any) -> logging.LogRecord:
 logging.handlers.QueueListener(queue.Queue())
 logging.handlers.QueueListener(queue.SimpleQueue())
 logging.handlers.QueueListener(multiprocessing.Queue())
+
+# These all raise at runtime.
+logging.basicConfig(filename="foo.log", handlers=[])  # type: ignore
+logging.basicConfig(filemode="w", handlers=[])  # type: ignore
+logging.basicConfig(stream=None, handlers=[])  # type: ignore
+logging.basicConfig(filename="foo.log", stream=None)  # type: ignore
+logging.basicConfig(filename=None, stream=None)  # type: ignore
+# These are ok.
+logging.basicConfig()
+logging.basicConfig(handlers=[])
+logging.basicConfig(filename="foo.log", filemode="w")
+logging.basicConfig(filename="foo.log", filemode="w", handlers=None)
+logging.basicConfig(stream=None)
+logging.basicConfig(stream=None, handlers=None)
+# dubious but accepted, has same meaning as 'stream=None'.
+logging.basicConfig(filename=None)
+# These are technically accepted at runtime, but are forbidden in the stubs to help
+# prevent user mistakes. Passing 'filemode' / 'encoding' / 'errors' does nothing
+# if 'filename' is not specified.
+logging.basicConfig(stream=None, filemode="w")  # type: ignore
+logging.basicConfig(stream=None, encoding="utf-8")  # type: ignore
+logging.basicConfig(stream=None, errors="strict")  # type: ignore
+logging.basicConfig(handlers=[], encoding="utf-8")  # type: ignore
+logging.basicConfig(handlers=[], errors="strict")  # type: ignore

stdlib/_thread.pyi

@@ -5,7 +5,7 @@ from collections.abc import Callable
 from threading import Thread
 from types import TracebackType
 from typing import Any, Final, NoReturn, final, overload
-from typing_extensions import TypeVarTuple, Unpack, disjoint_base
+from typing_extensions import TypeVarTuple, Unpack, deprecated, disjoint_base
 
 _Ts = TypeVarTuple("_Ts")
 
@@ -38,9 +38,12 @@ if sys.version_info >= (3, 13):
         def acquire(self, blocking: bool = True, timeout: float = -1) -> bool: ...
         def release(self) -> None: ...
         def locked(self) -> bool: ...
-        def acquire_lock(self, blocking: bool = True, timeout: float = -1) -> bool: ...
-        def release_lock(self) -> None: ...
-        def locked_lock(self) -> bool: ...
+        @deprecated("Obsolete synonym. Use `acquire()` instead.")
+        def acquire_lock(self, blocking: bool = True, timeout: float = -1) -> bool: ...  # undocumented
+        @deprecated("Obsolete synonym. Use `release()` instead.")
+        def release_lock(self) -> None: ...  # undocumented
+        @deprecated("Obsolete synonym. Use `locked()` instead.")
+        def locked_lock(self) -> bool: ...  # undocumented
         def __enter__(self) -> bool: ...
         def __exit__(
             self, type: type[BaseException] | None, value: BaseException | None, traceback: TracebackType | None
@@ -53,9 +56,12 @@ else:
         def acquire(self, blocking: bool = True, timeout: float = -1) -> bool: ...
         def release(self) -> None: ...
         def locked(self) -> bool: ...
-        def acquire_lock(self, blocking: bool = True, timeout: float = -1) -> bool: ...
-        def release_lock(self) -> None: ...
-        def locked_lock(self) -> bool: ...
+        @deprecated("Obsolete synonym. Use `acquire()` instead.")
+        def acquire_lock(self, blocking: bool = True, timeout: float = -1) -> bool: ...  # undocumented
+        @deprecated("Obsolete synonym. Use `release()` instead.")
+        def release_lock(self) -> None: ...  # undocumented
+        @deprecated("Obsolete synonym. Use `locked()` instead.")
+        def locked_lock(self) -> bool: ...  # undocumented
         def __enter__(self) -> bool: ...
         def __exit__(
             self, type: type[BaseException] | None, value: BaseException | None, traceback: TracebackType | None
@@ -65,12 +71,12 @@ else:
 def start_new_thread(function: Callable[[Unpack[_Ts]], object], args: tuple[Unpack[_Ts]], /) -> int: ...
 @overload
 def start_new_thread(function: Callable[..., object], args: tuple[Any, ...], kwargs: dict[str, Any], /) -> int: ...
-
-# Obsolete synonym for start_new_thread()
 @overload
-def start_new(function: Callable[[Unpack[_Ts]], object], args: tuple[Unpack[_Ts]], /) -> int: ...
+@deprecated("Obsolete synonym. Use `start_new_thread()` instead.")
+def start_new(function: Callable[[Unpack[_Ts]], object], args: tuple[Unpack[_Ts]], /) -> int: ...  # undocumented
 @overload
-def start_new(function: Callable[..., object], args: tuple[Any, ...], kwargs: dict[str, Any], /) -> int: ...
+@deprecated("Obsolete synonym. Use `start_new_thread()` instead.")
+def start_new(function: Callable[..., object], args: tuple[Any, ...], kwargs: dict[str, Any], /) -> int: ...  # undocumented
 
 if sys.version_info >= (3, 10):
     def interrupt_main(signum: signal.Signals = signal.SIGINT, /) -> None: ...
@@ -79,9 +85,11 @@ else:
     def interrupt_main() -> None: ...
 
 def exit() -> NoReturn: ...
-def exit_thread() -> NoReturn: ...  # Obsolete synonym for exit()
+@deprecated("Obsolete synonym. Use `exit()` instead.")
+def exit_thread() -> NoReturn: ...  # undocumented
 def allocate_lock() -> LockType: ...
-def allocate() -> LockType: ...  # Obsolete synonym for allocate_lock()
+@deprecated("Obsolete synonym. Use `allocate_lock()` instead.")
+def allocate() -> LockType: ...  # undocumented
 def get_ident() -> int: ...
 def stack_size(size: int = 0, /) -> int: ...
 

stdlib/asyncio/tasks.pyi

@@ -369,14 +369,9 @@ else:
     async def wait_for(fut: _FutureLike[_T], timeout: float | None, *, loop: AbstractEventLoop | None = None) -> _T: ...
 
 if sys.version_info >= (3, 11):
-    @overload
     async def wait(
         fs: Iterable[_FT], *, timeout: float | None = None, return_when: str = "ALL_COMPLETED"
     ) -> tuple[set[_FT], set[_FT]]: ...
-    @overload
-    async def wait(
-        fs: Iterable[Task[_T]], *, timeout: float | None = None, return_when: str = "ALL_COMPLETED"
-    ) -> tuple[set[Task[_T]], set[Task[_T]]]: ...
 
 elif sys.version_info >= (3, 10):
     @overload

stdlib/logging/__init__.pyi

@@ -576,19 +576,40 @@ if sys.version_info >= (3, 11):
     def getLevelNamesMapping() -> dict[str, int]: ...
 
 def makeLogRecord(dict: Mapping[str, object]) -> LogRecord: ...
+@overload  # handlers is non-None
 def basicConfig(
     *,
-    filename: StrPath | None = ...,
-    filemode: str = ...,
-    format: str = ...,
-    datefmt: str | None = ...,
-    style: _FormatStyle = ...,
-    level: _Level | None = ...,
-    stream: SupportsWrite[str] | None = ...,
-    handlers: Iterable[Handler] | None = ...,
-    force: bool | None = ...,
-    encoding: str | None = ...,
-    errors: str | None = ...,
+    format: str = ...,  # default value depends on the value of `style`
+    datefmt: str | None = None,
+    style: _FormatStyle = "%",
+    level: _Level | None = None,
+    handlers: Iterable[Handler],
+    force: bool | None = False,
+) -> None: ...
+@overload  # handlers is None, filename is passed (but possibly None)
+def basicConfig(
+    *,
+    filename: StrPath | None,
+    filemode: str = "a",
+    format: str = ...,  # default value depends on the value of `style`
+    datefmt: str | None = None,
+    style: _FormatStyle = "%",
+    level: _Level | None = None,
+    handlers: None = None,
+    force: bool | None = False,
+    encoding: str | None = None,
+    errors: str | None = "backslashreplace",
+) -> None: ...
+@overload  # handlers is None, filename is not passed
+def basicConfig(
+    *,
+    format: str = ...,  # default value depends on the value of `style`
+    datefmt: str | None = None,
+    style: _FormatStyle = "%",
+    level: _Level | None = None,
+    stream: SupportsWrite[str] | None = None,
+    handlers: None = None,
+    force: bool | None = False,
 ) -> None: ...
 def shutdown(handlerList: Sequence[Any] = ...) -> None: ...  # handlerList is undocumented
 def setLoggerClass(klass: type[Logger]) -> None: ...

stdlib/multiprocessing/managers.pyi

@@ -26,6 +26,8 @@ from .util import Finalize as _Finalize
 __all__ = ["BaseManager", "SyncManager", "BaseProxy", "Token", "SharedMemoryManager"]
 
 _T = TypeVar("_T")
+_T1 = TypeVar("_T1")
+_T2 = TypeVar("_T2")
 _KT = TypeVar("_KT")
 _VT = TypeVar("_VT")
 _S = TypeVar("_S")
@@ -94,6 +96,25 @@ if sys.version_info >= (3, 13):
         def keys(self) -> list[_KT]: ...  # type: ignore[override]
         def items(self) -> list[tuple[_KT, _VT]]: ...  # type: ignore[override]
         def values(self) -> list[_VT]: ...  # type: ignore[override]
+        if sys.version_info >= (3, 14):
+            # Next methods are copied from builtins.dict
+            @overload
+            def fromkeys(self, iterable: Iterable[_T], value: None = None, /) -> dict[_T, Any | None]: ...
+            @overload
+            def fromkeys(self, iterable: Iterable[_T], value: _S, /) -> dict[_T, _S]: ...
+            def __reversed__(self) -> Iterator[_KT]: ...
+            @overload
+            def __or__(self, value: dict[_KT, _VT], /) -> dict[_KT, _VT]: ...
+            @overload
+            def __or__(self, value: dict[_T1, _T2], /) -> dict[_KT | _T1, _VT | _T2]: ...
+            @overload
+            def __ror__(self, value: dict[_KT, _VT], /) -> dict[_KT, _VT]: ...
+            @overload
+            def __ror__(self, value: dict[_T1, _T2], /) -> dict[_KT | _T1, _VT | _T2]: ...
+            @overload  # type: ignore[misc]
+            def __ior__(self, value: SupportsKeysAndGetItem[_KT, _VT], /) -> Self: ...
+            @overload
+            def __ior__(self, value: Iterable[tuple[_KT, _VT]], /) -> Self: ...
 
     class DictProxy(_BaseDictProxy[_KT, _VT]):
         def __class_getitem__(cls, args: Any, /) -> GenericAlias: ...
@@ -193,6 +214,8 @@ class BaseListProxy(BaseProxy, MutableSequence[_T]):
     def insert(self, index: SupportsIndex, object: _T, /) -> None: ...
     def remove(self, value: _T, /) -> None: ...
     if sys.version_info >= (3, 14):
+        # Next methods are copied from builtins.list
+        def clear(self) -> None: ...
         def copy(self) -> list[_T]: ...
     # Use BaseListProxy[SupportsRichComparisonT] for the first overload rather than [SupportsRichComparison]
     # to work around invariance

stdlib/multiprocessing/queues.pyi

@@ -1,15 +1,21 @@
 import sys
 from types import GenericAlias
-from typing import Any, Generic, TypeVar
+from typing import Any, Generic, NewType, TypeVar
 
 __all__ = ["Queue", "SimpleQueue", "JoinableQueue"]
 
 _T = TypeVar("_T")
 
+_QueueState = NewType("_QueueState", object)
+_JoinableQueueState = NewType("_JoinableQueueState", object)
+_SimpleQueueState = NewType("_SimpleQueueState", object)
+
 class Queue(Generic[_T]):
     # FIXME: `ctx` is a circular dependency and it's not actually optional.
     # It's marked as such to be able to use the generic Queue in __init__.pyi.
     def __init__(self, maxsize: int = 0, *, ctx: Any = ...) -> None: ...
+    def __getstate__(self) -> _QueueState: ...
+    def __setstate__(self, state: _QueueState) -> None: ...
     def put(self, obj: _T, block: bool = True, timeout: float | None = None) -> None: ...
     def get(self, block: bool = True, timeout: float | None = None) -> _T: ...
     def qsize(self) -> int: ...
@@ -24,13 +30,17 @@ class Queue(Generic[_T]):
         def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
 
 class JoinableQueue(Queue[_T]):
+    def __getstate__(self) -> _JoinableQueueState: ...  # type: ignore[override]
+    def __setstate__(self, state: _JoinableQueueState) -> None: ...  # type: ignore[override]
     def task_done(self) -> None: ...
     def join(self) -> None: ...
 
 class SimpleQueue(Generic[_T]):
     def __init__(self, *, ctx: Any = ...) -> None: ...
     def close(self) -> None: ...
     def empty(self) -> bool: ...
+    def __getstate__(self) -> _SimpleQueueState: ...
+    def __setstate__(self, state: _SimpleQueueState) -> None: ...
     def get(self) -> _T: ...
     def put(self, obj: _T) -> None: ...
     def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...

stdlib/opcode.pyi

@@ -41,7 +41,7 @@ if sys.version_info >= (3, 13):
 opname: Final[list[str]]
 
 opmap: Final[dict[str, int]]
-HAVE_ARGUMENT: Final = 43
-EXTENDED_ARG: Final = 69
+HAVE_ARGUMENT: Final[int]
+EXTENDED_ARG: Final[int]
 
 def stack_effect(opcode: int, oparg: int | None = None, /, *, jump: bool | None = None) -> int: ...

stdlib/pickle.pyi

@@ -1,3 +1,4 @@
+import sys
 from _pickle import (
     PickleError as PickleError,
     Pickler as Pickler,
@@ -103,7 +104,10 @@ __all__ = [
 ]
 
 HIGHEST_PROTOCOL: Final = 5
-DEFAULT_PROTOCOL: Final = 5
+if sys.version_info >= (3, 14):
+    DEFAULT_PROTOCOL: Final = 5
+else:
+    DEFAULT_PROTOCOL: Final = 4
 
 bytes_types: tuple[type[Any], ...]  # undocumented
 

stubs/Authlib/METADATA.toml

@@ -1,3 +1,3 @@
-version = "1.6.7"
+version = "1.6.8"
 upstream_repository = "https://github.com/authlib/authlib"
 requires = ["cryptography"]