Merge remote-tracking branch 'upstream/main' into codex/python315-calendar-difflib

# Conflicts:
#	stdlib/@tests/stubtest_allowlists/py315.txt

Author: JelleZijlstra

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

@@ -2,14 +2,12 @@
 # TODO: Allowlist entries that should be fixed
 # ============================================
 
-_decimal.SPEC_VERSION
 _pyrepl.fancy_termios
 _pyrepl.unix_console
 _pyrepl.unix_eventqueue
 ctypes.c_double_complex._type_
 ctypes.c_float_complex._type_
 ctypes.c_longdouble_complex._type_
-decimal.SPEC_VERSION
 mmap.MS_ASYNC
 mmap.MS_INVALIDATE
 mmap.MS_SYNC

stdlib/@tests/stubtest_allowlists/py315.txt

@@ -16,8 +16,6 @@ _interpqueues.create
 _interpqueues.put
 _json.make_scanner.array_hook
 _json.scanstring
-_pydecimal.SPEC_VERSION
-_pydecimal.__all__
 _pyrepl.base_eventqueue
 _pyrepl.commands
 _pyrepl.completing_reader
@@ -79,9 +77,6 @@ ast.ImportFrom.is_lazy
 ast.dump
 ast.parse
 ast.type_param.__init__
-asyncio.taskgroups.TaskGroup.cancel
-asyncio.tools.display_awaited_by_tasks_table
-asyncio.tools.display_awaited_by_tasks_tree
 base64.a85decode
 base64.b16decode
 base64.b16encode
@@ -117,7 +112,6 @@ binascii.b2a_base32
 binascii.b2a_base64
 binascii.b2a_base85
 binascii.unhexlify
-cProfile.label
 codecs.backslashreplace_errors
 codecs.ignore_errors
 codecs.namereplace_errors
@@ -142,9 +136,6 @@ ctypes.SetPointerType
 dataclasses._MISSING_TYPE
 dataclasses.MISSING
 dataclasses.field
-dbm.dumb._Database.reorganize
-dbm.sqlite3.REORGANIZE
-dbm.sqlite3._Database.reorganize
 doctest.DocTestRunner.report_skip
 enum.__all__
 enum.auto.__init__
@@ -271,7 +262,6 @@ profiling.sampling.sample
 profiling.sampling.stack_collector
 profiling.sampling.string_table
 profiling.tracing
-pstats.Stats.print_call_subheading
 pydoc.Doc.STDLIB_DIR
 pydoc.Doc.getdocloc
 pyexpat.XMLParserType.SetBillionLaughsAttackProtectionActivationThreshold
@@ -328,7 +318,6 @@ sys.last_exc
 sys.lazy_modules
 sys.set_lazy_imports
 sys.set_lazy_imports_filter
-sysconfig.is_python_build
 tarfile.TarFile.__init__
 threading.Condition.locked
 threading.__all__

stdlib/@tests/stubtest_allowlists/win32-py315.txt

@@ -2,7 +2,6 @@
 # TODO: Allowlist entries that should be fixed
 # ============================================
 
-_decimal.SPEC_VERSION
 _socket.IPV6_HDRINCL
 _winapi.DeregisterEventSource
 _winapi.EVENTLOG_AUDIT_FAILURE
@@ -15,7 +14,6 @@ _winapi.GetOEMCP
 _winapi.RegisterEventSource
 _winapi.ReportEvent
 asyncio.windows_events.IocpProactor.finish_socket_func
-decimal.SPEC_VERSION
 socket.IPV6_HDRINCL
 socket.__all__
 winreg.DeleteTree

stdlib/_decimal.pyi

@@ -25,6 +25,8 @@ _TrapType: TypeAlias = type[DecimalException]
 
 __version__: Final[str]
 __libmpdec_version__: Final[str]
+if sys.version_info >= (3, 15):
+    SPEC_VERSION: Final[str]
 
 ROUND_DOWN: Final = "ROUND_DOWN"
 ROUND_HALF_UP: Final = "ROUND_HALF_UP"

stdlib/_pydecimal.pyi

@@ -45,3 +45,6 @@ __all__ = [
 
 if sys.version_info >= (3, 14):
     __all__ += ["IEEEContext", "IEEE_CONTEXT_MAX_BITS"]
+
+if sys.version_info >= (3, 15):
+    __all__ += ["SPEC_VERSION"]

stdlib/asyncio/taskgroups.pyi

@@ -37,3 +37,5 @@ class TaskGroup:
         ) -> Task[_T]: ...
 
     def _on_task_done(self, task: Task[object]) -> None: ...
+    if sys.version_info >= (3, 15):
+        def cancel(self) -> None: ...

stdlib/asyncio/tools.pyi

@@ -42,5 +42,10 @@ 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: ...
+if sys.version_info >= (3, 15):
+    def display_awaited_by_tasks_table(pid: SupportsIndex, retries: SupportsIndex = 3) -> None: ...
+    def display_awaited_by_tasks_tree(pid: SupportsIndex, retries: SupportsIndex = 3) -> None: ...
+
+else:
+    def display_awaited_by_tasks_table(pid: SupportsIndex) -> None: ...
+    def display_awaited_by_tasks_tree(pid: SupportsIndex) -> None: ...

stdlib/cProfile.pyi

@@ -1,4 +1,5 @@
 import _lsprof
+import sys
 from _typeshed import StrOrBytesPath, Unused
 from collections.abc import Callable, Mapping
 from types import CodeType
@@ -28,4 +29,5 @@ class Profile(_lsprof.Profiler):
     def __enter__(self) -> Self: ...
     def __exit__(self, *exc_info: Unused) -> None: ...
 
-def label(code: str | CodeType) -> _Label: ...  # undocumented
+if sys.version_info < (3, 15):
+    def label(code: str | CodeType) -> _Label: ...  # undocumented

stdlib/dbm/dumb.pyi

@@ -18,6 +18,9 @@ error = OSError
 class _Database(MutableMapping[_KeyType, bytes]):
     def __init__(self, filebasename: str, mode: str, flag: str = "c") -> None: ...
     def sync(self) -> None: ...
+    if sys.version_info >= (3, 15):
+        def reorganize(self) -> None: ...
+
     def iterkeys(self) -> Iterator[bytes]: ...  # undocumented
     def close(self) -> None: ...
     def __getitem__(self, key: _KeyType) -> bytes: ...

stdlib/dbm/sqlite3.pyi

@@ -1,3 +1,4 @@
+import sys
 from _typeshed import ReadableBuffer, StrOrBytesPath, Unused
 from collections.abc import Generator, MutableMapping
 from typing import Final, Literal, TypeAlias
@@ -9,6 +10,8 @@ LOOKUP_KEY: Final[LiteralString]
 STORE_KV: Final[LiteralString]
 DELETE_KEY: Final[LiteralString]
 ITER_KEYS: Final[LiteralString]
+if sys.version_info >= (3, 15):
+    REORGANIZE: Final[LiteralString]
 
 _SqliteData: TypeAlias = str | ReadableBuffer | int | float
 
@@ -25,5 +28,7 @@ class _Database(MutableMapping[bytes, bytes]):
     def keys(self) -> list[bytes]: ...  # type: ignore[override]
     def __enter__(self) -> Self: ...
     def __exit__(self, *args: Unused) -> None: ...
+    if sys.version_info >= (3, 15):
+        def reorganize(self) -> None: ...
 
 def open(filename: StrOrBytesPath, /, flag: Literal["r", "w", "c", "n"] = "r", mode: int = 0o666) -> _Database: ...