Merge branch 'main' into importlib.resources

Author: AlexWaygood

stdlib/@tests/stubtest_allowlists/common.txt

@@ -500,7 +500,6 @@ types.MethodType.__closure__  # read-only but not actually a property; stubtest
 types.MethodType.__defaults__  # read-only but not actually a property; stubtest thinks it doesn't exist.
 types.ModuleType.__dict__  # read-only but not actually a property; stubtest thinks it's a mutable attribute.
 types.ModuleType.__getattr__  # this doesn't exist at runtime
-types.SimpleNamespace.__init__  # class doesn't accept positional arguments but has default C signature
 
 # sys attributes that are not always defined
 sys.gettotalrefcount  # Available on python debug builds

stdlib/@tests/stubtest_allowlists/py310.txt

@@ -249,6 +249,7 @@ pkgutil.ImpImporter\..*
 pkgutil.ImpLoader\..*
 
 types.CodeType.replace  # stubtest thinks default values are None but None doesn't work at runtime
+types.SimpleNamespace.__init__ # class doesn't accept positional arguments but has default C signature
 
 # These enums derive from (str, Enum)
 pstats.SortKey.__new__

stdlib/@tests/stubtest_allowlists/py311.txt

@@ -135,6 +135,7 @@ inspect._ParameterKind.description  # Still exists, but stubtest can't see it
 os.PathLike.__class_getitem__  # PathLike is a protocol; we don't expect all PathLike classes to implement class_getitem
 poplib.POP3_SSL.stls  # bad declaration of inherited function. See poplib.pyi
 types.GenericAlias.__call__  # Would be complicated to fix properly, Any could silence problems. #6392
+types.SimpleNamespace.__init__ # class doesn't accept positional arguments but has default C signature
 types.GenericAlias.__getattr__
 types.GenericAlias.__mro_entries__
 weakref.ProxyType.__reversed__  # Doesn't really exist

stdlib/@tests/stubtest_allowlists/py312.txt

@@ -184,6 +184,9 @@ typing.ParamSpecKwargs.__mro_entries__
 typing.TypeVar.__mro_entries__
 typing.TypeVarTuple.__mro_entries__
 
+# class doesn't accept positional arguments but has default C signature
+types.SimpleNamespace.__init__
+
 # TODO: mypy should infer that this attribute is inherited from builtins.type;
 # why doesn't it infer this?
 typing.SupportsAbs.__type_params__

stdlib/@tests/stubtest_allowlists/py313.txt

@@ -12,9 +12,7 @@ _ctypes.pointer
 _ctypes.sizeof
 _thread.interrupt_main
 _thread.lock
-_thread.stack_size
 _thread.start_joinable_thread
-_thread.start_new_thread
 _tkinter.create
 asyncio.AbstractEventLoop.create_server
 asyncio.AbstractServer.abort_clients
@@ -92,34 +90,15 @@ importlib.metadata._meta.SimplePath.exists
 importlib.metadata._meta.SimplePath.read_bytes
 importlib.metadata._meta.SimplePath.read_text
 importlib.metadata.diagnose
-mailbox.Maildir.add_flag
-mailbox.Maildir.get_flags
-mailbox.Maildir.get_info
-mailbox.Maildir.remove_flag
-mailbox.Maildir.set_flags
-mailbox.Maildir.set_info
 os.path.splitroot
-pdb.Pdb.MAX_CHAINED_EXCEPTION_DEPTH
-pdb.Pdb.completedefault
-pdb.Pdb.completenames
-pdb.Pdb.do_exceptions
-pdb.Pdb.interaction
-pdb.Pdb.message
-pdb.Pdb.user_opcode
 # `__replace__` to be special cased in dataclasses
 pstats.FunctionProfile.__replace__
 pstats.StatsProfile.__replace__
-pydoc.pager
-pydoc.pipepager
-pydoc.plainpager
-pydoc.tempfilepager
-pydoc.ttypager
 site.gethistoryfile
 site.register_readline
 sre_compile.SRE_FLAG_TEMPLATE
 sre_constants.SRE_FLAG_TEMPLATE
 sre_parse.SRE_FLAG_TEMPLATE
-threading.stack_size
 tkinter.Misc.after_info
 tkinter.Misc.busy
 tkinter.Misc.busy_cget
@@ -148,20 +127,6 @@ tkinter.Text.count
 tkinter.Wm.wm_attributes
 trace.CoverageResults.write_results
 types.MappingProxyType.get
-unittest.IsolatedAsyncioTestCase.loop_factory
-unittest.TestProgram.usageExit
-unittest.__all__
-unittest.async_case.IsolatedAsyncioTestCase.loop_factory
-unittest.findTestCases
-unittest.getTestCaseNames
-unittest.loader.findTestCases
-unittest.loader.getTestCaseNames
-unittest.loader.makeSuite
-unittest.main.TestProgram.usageExit
-unittest.makeSuite
-unittest.mock.NonCallableMock._calls_repr
-unittest.mock.ThreadingMock
-unittest.mock.__all__
 zipfile.CompleteDirs.inject
 zipfile.ZipInfo.compress_level
 zipfile._path.CompleteDirs.inject

stdlib/@tests/stubtest_allowlists/py38.txt

@@ -206,6 +206,7 @@ types.GetSetDescriptorType.__get__
 types.MemberDescriptorType.__get__
 types.MethodDescriptorType.__get__
 types.WrapperDescriptorType.__get__
+types.SimpleNamespace.__init__  # class doesn't accept positional arguments but has default C signature
 multiprocessing.managers.DictProxy.clear
 multiprocessing.managers.DictProxy.popitem
 

stdlib/@tests/stubtest_allowlists/py39.txt

@@ -223,6 +223,7 @@ pkgutil.ImpImporter\..*
 pkgutil.ImpLoader\..*
 
 types.CodeType.replace  # stubtest thinks default values are None but None doesn't work at runtime
+types.SimpleNamespace.__init__  # class doesn't accept positional arguments but has default C signature
 
 # These enums derive from (str, Enum)
 pstats.SortKey.__new__

stdlib/@tests/test_cases/check_types.py

@@ -0,0 +1,27 @@
+import sys
+import types
+from collections import UserDict
+
+# test `types.SimpleNamespace`
+
+# Valid:
+types.SimpleNamespace()
+types.SimpleNamespace(x=1, y=2)
+
+if sys.version_info >= (3, 13):
+    types.SimpleNamespace(())
+    types.SimpleNamespace([])
+    types.SimpleNamespace([("x", "y"), ("z", 1)])
+    types.SimpleNamespace({})
+    types.SimpleNamespace(UserDict({"x": 1, "y": 2}))
+
+
+# Invalid:
+types.SimpleNamespace(1)  # type: ignore
+types.SimpleNamespace([1])  # type: ignore
+types.SimpleNamespace([["x"]])  # type: ignore
+types.SimpleNamespace(**{1: 2})  # type: ignore
+types.SimpleNamespace({1: 2})  # type: ignore
+types.SimpleNamespace([[1, 2]])  # type: ignore
+types.SimpleNamespace(UserDict({1: 2}))  # type: ignore
+types.SimpleNamespace([[[], 2]])  # type: ignore

stdlib/_thread.pyi

@@ -13,7 +13,7 @@ error = RuntimeError
 def _count() -> int: ...
 @final
 class LockType:
-    def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ...
+    def acquire(self, blocking: bool = True, timeout: float = -1) -> bool: ...
     def release(self) -> None: ...
     def locked(self) -> bool: ...
     def __enter__(self) -> bool: ...
@@ -22,14 +22,14 @@ class LockType:
     ) -> None: ...
 
 @overload
-def start_new_thread(function: Callable[[Unpack[_Ts]], object], args: tuple[Unpack[_Ts]]) -> int: ...
+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: ...
+def start_new_thread(function: Callable[..., object], args: tuple[Any, ...], kwargs: dict[str, Any], /) -> int: ...
 def interrupt_main() -> None: ...
 def exit() -> NoReturn: ...
 def allocate_lock() -> LockType: ...
 def get_ident() -> int: ...
-def stack_size(size: int = ...) -> int: ...
+def stack_size(size: int = 0, /) -> int: ...
 
 TIMEOUT_MAX: float
 

stdlib/mailbox.pyi

@@ -115,6 +115,14 @@ class Maildir(Mailbox[MaildirMessage]):
     def get_message(self, key: str) -> MaildirMessage: ...
     def get_bytes(self, key: str) -> bytes: ...
     def get_file(self, key: str) -> _ProxyFile[bytes]: ...
+    if sys.version_info >= (3, 13):
+        def get_info(self, key: str) -> str: ...
+        def set_info(self, key: str, info: str) -> None: ...
+        def get_flags(self, key: str) -> str: ...
+        def set_flags(self, key: str, flags: str) -> None: ...
+        def add_flag(self, key: str, flag: str) -> None: ...
+        def remove_flag(self, key: str, flag: str) -> None: ...
+
     def iterkeys(self) -> Iterator[str]: ...
     def __contains__(self, key: str) -> bool: ...
     def __len__(self) -> int: ...

stdlib/pdb.pyi

@@ -5,7 +5,7 @@ from cmd import Cmd
 from collections.abc import Callable, Iterable, Mapping, Sequence
 from inspect import _SourceObjectType
 from types import CodeType, FrameType, TracebackType
-from typing import IO, Any, ClassVar, TypeVar
+from typing import IO, Any, ClassVar, Final, TypeVar
 from typing_extensions import ParamSpec, Self
 
 __all__ = ["run", "pm", "Pdb", "runeval", "runctx", "runcall", "set_trace", "post_mortem", "help"]
@@ -30,6 +30,9 @@ class Pdb(Bdb, Cmd):
 
     commands_resuming: ClassVar[list[str]]
 
+    if sys.version_info >= (3, 13):
+        MAX_CHAINED_EXCEPTION_DEPTH: Final = 999
+
     aliases: dict[str, str]
     mainpyfile: str
     _wait_for_mainpyfile: bool
@@ -58,8 +61,16 @@ class Pdb(Bdb, Cmd):
     if sys.version_info < (3, 11):
         def execRcLines(self) -> None: ...
 
+    if sys.version_info >= (3, 13):
+        user_opcode = Bdb.user_line
+
     def bp_commands(self, frame: FrameType) -> bool: ...
-    def interaction(self, frame: FrameType | None, traceback: TracebackType | None) -> None: ...
+
+    if sys.version_info >= (3, 13):
+        def interaction(self, frame: FrameType | None, tb_or_exc: TracebackType | BaseException | None) -> None: ...
+    else:
+        def interaction(self, frame: FrameType | None, traceback: TracebackType | None) -> None: ...
+
     def displayhook(self, obj: object) -> None: ...
     def handle_command_def(self, line: str) -> bool: ...
     def defaultFile(self) -> str: ...
@@ -72,6 +83,9 @@ class Pdb(Bdb, Cmd):
     if sys.version_info < (3, 11):
         def _runscript(self, filename: str) -> None: ...
 
+    if sys.version_info >= (3, 13):
+        def completedefault(self, text: str, line: str, begidx: int, endidx: int) -> list[str]: ...  # type: ignore[override]
+
     def do_commands(self, arg: str) -> bool | None: ...
     def do_break(self, arg: str, temporary: bool = ...) -> bool | None: ...
     def do_tbreak(self, arg: str) -> bool | None: ...
@@ -81,6 +95,9 @@ class Pdb(Bdb, Cmd):
     def do_ignore(self, arg: str) -> bool | None: ...
     def do_clear(self, arg: str) -> bool | None: ...
     def do_where(self, arg: str) -> bool | None: ...
+    if sys.version_info >= (3, 13):
+        def do_exceptions(self, arg: str) -> bool | None: ...
+
     def do_up(self, arg: str) -> bool | None: ...
     def do_down(self, arg: str) -> bool | None: ...
     def do_until(self, arg: str) -> bool | None: ...
@@ -125,8 +142,14 @@ class Pdb(Bdb, Cmd):
     def help_exec(self) -> None: ...
     def help_pdb(self) -> None: ...
     def sigint_handler(self, signum: signal.Signals, frame: FrameType) -> None: ...
-    def message(self, msg: str) -> None: ...
+    if sys.version_info >= (3, 13):
+        def message(self, msg: str, end: str = "\n") -> None: ...
+    else:
+        def message(self, msg: str) -> None: ...
+
     def error(self, msg: str) -> None: ...
+    if sys.version_info >= (3, 13):
+        def completenames(self, text: str, line: str, begidx: int, endidx: int) -> list[str]: ...  # type: ignore[override]
     if sys.version_info >= (3, 12):
         def set_convenience_variable(self, frame: FrameType, name: str, value: Any) -> None: ...
 

stdlib/pydoc.pyi

@@ -5,7 +5,7 @@ from builtins import list as _list  # "list" conflicts with method name
 from collections.abc import Callable, Container, Mapping, MutableMapping
 from reprlib import Repr
 from types import MethodType, ModuleType, TracebackType
-from typing import IO, Any, AnyStr, Final, NoReturn, TypeVar
+from typing import IO, Any, AnyStr, Final, NoReturn, Protocol, TypeVar
 from typing_extensions import TypeGuard
 
 __all__ = ["help"]
@@ -17,6 +17,9 @@ __date__: Final[str]
 __version__: Final[str]
 __credits__: Final[str]
 
+class _Pager(Protocol):
+    def __call__(self, text: str, title: str = "") -> None: ...
+
 def pathdirs() -> list[str]: ...
 def getdoc(object: object) -> str: ...
 def splitdoc(doc: AnyStr) -> tuple[AnyStr, AnyStr]: ...
@@ -229,16 +232,36 @@ class TextDoc(Doc):
             doc: Any | None = None,
         ) -> str: ...
 
-def pager(text: str) -> None: ...
-def getpager() -> Callable[[str], None]: ...
+if sys.version_info >= (3, 13):
+    def pager(text: str, title: str = "") -> None: ...
+
+else:
+    def pager(text: str) -> None: ...
+
 def plain(text: str) -> str: ...
-def pipepager(text: str, cmd: str) -> None: ...
-def tempfilepager(text: str, cmd: str) -> None: ...
-def ttypager(text: str) -> None: ...
-def plainpager(text: str) -> None: ...
 def describe(thing: Any) -> str: ...
 def locate(path: str, forceload: bool = ...) -> object: ...
 
+if sys.version_info >= (3, 13):
+    def get_pager() -> _Pager: ...
+    def pipe_pager(text: str, cmd: str, title: str = "") -> None: ...
+    def tempfile_pager(text: str, cmd: str, title: str = "") -> None: ...
+    def tty_pager(text: str, title: str = "") -> None: ...
+    def plain_pager(text: str, title: str = "") -> None: ...
+
+    # For backwards compatibility.
+    getpager = get_pager
+    pipepager = pipe_pager
+    tempfilepager = tempfile_pager
+    ttypager = tty_pager
+    plainpager = plain_pager
+else:
+    def getpager() -> Callable[[str], None]: ...
+    def pipepager(text: str, cmd: str) -> None: ...
+    def tempfilepager(text: str, cmd: str) -> None: ...
+    def ttypager(text: str) -> None: ...
+    def plainpager(text: str) -> None: ...
+
 text: TextDoc
 html: HTMLDoc
 

stdlib/threading.pyi

@@ -61,7 +61,7 @@ if sys.version_info >= (3, 10):
     def gettrace() -> TraceFunction | None: ...
     def getprofile() -> ProfileFunction | None: ...
 
-def stack_size(size: int = ...) -> int: ...
+def stack_size(size: int = 0, /) -> int: ...
 
 TIMEOUT_MAX: float
 

stdlib/types.pyi

@@ -312,7 +312,11 @@ class MappingProxyType(Mapping[_KT, _VT_co]):
 
 class SimpleNamespace:
     __hash__: ClassVar[None]  # type: ignore[assignment]
-    def __init__(self, **kwargs: Any) -> None: ...
+    if sys.version_info >= (3, 13):
+        def __init__(self, mapping_or_iterable: Mapping[str, Any] | Iterable[tuple[str, Any]] = (), /, **kwargs: Any) -> None: ...
+    else:
+        def __init__(self, **kwargs: Any) -> None: ...
+
     def __eq__(self, value: object, /) -> bool: ...
     def __getattribute__(self, name: str, /) -> Any: ...
     def __setattr__(self, name: str, value: Any, /) -> None: ...

stdlib/unittest/__init__.pyi

@@ -11,13 +11,7 @@ from .case import (
     skipIf as skipIf,
     skipUnless as skipUnless,
 )
-from .loader import (
-    TestLoader as TestLoader,
-    defaultTestLoader as defaultTestLoader,
-    findTestCases as findTestCases,
-    getTestCaseNames as getTestCaseNames,
-    makeSuite as makeSuite,
-)
+from .loader import TestLoader as TestLoader, defaultTestLoader as defaultTestLoader
 from .main import TestProgram as TestProgram, main as main
 from .result import TestResult as TestResult
 from .runner import TextTestResult as TextTestResult, TextTestRunner as TextTestRunner
@@ -52,12 +46,14 @@ __all__ = [
     "registerResult",
     "removeResult",
     "removeHandler",
-    "getTestCaseNames",
-    "makeSuite",
-    "findTestCases",
     "addModuleCleanup",
 ]
 
+if sys.version_info < (3, 13):
+    from .loader import findTestCases as findTestCases, getTestCaseNames as getTestCaseNames, makeSuite as makeSuite
+
+    __all__ += ["getTestCaseNames", "makeSuite", "findTestCases"]
+
 if sys.version_info >= (3, 11):
     __all__ += ["enterModuleContext", "doModuleCleanups"]
 

stdlib/unittest/async_case.pyi

@@ -1,4 +1,5 @@
 import sys
+from asyncio.events import AbstractEventLoop
 from collections.abc import Awaitable, Callable
 from typing import TypeVar
 from typing_extensions import ParamSpec
@@ -12,6 +13,9 @@ _T = TypeVar("_T")
 _P = ParamSpec("_P")
 
 class IsolatedAsyncioTestCase(TestCase):
+    if sys.version_info >= (3, 13):
+        loop_factory: Callable[[], AbstractEventLoop] | None = None
+
     async def asyncSetUp(self) -> None: ...
     async def asyncTearDown(self) -> None: ...
     def addAsyncCleanup(self, func: Callable[_P, Awaitable[object]], /, *args: _P.args, **kwargs: _P.kwargs) -> None: ...