Add Python 3.15 JSON updates

Author: JelleZijlstra

stdlib/@tests/stubtest_allowlists/py315.txt

@@ -14,8 +14,6 @@ _frozen_importlib_external._LoaderBasics.load_module
 _frozen_importlib_external.cache_from_source
 _interpqueues.create
 _interpqueues.put
-_json.make_scanner.array_hook
-_json.scanstring
 _pyrepl.base_eventqueue
 _pyrepl.commands
 _pyrepl.completing_reader
@@ -182,9 +180,6 @@ io.Reader.__class_getitem__
 io.Reader.read
 io.Writer.__class_getitem__
 io.Writer.write
-json.decoder.JSONDecoder.__init__
-json.load
-json.loads
 mailbox.Mailbox.__enter__
 mailbox.Mailbox.__exit__
 mailbox._ProxyFile.__class_getitem__

stdlib/_json.pyi

@@ -1,3 +1,4 @@
+import sys
 from collections.abc import Callable
 from typing import Any, final
 from typing_extensions import Self
@@ -36,6 +37,8 @@ class make_encoder:
 
 @final
 class make_scanner:
+    if sys.version_info >= (3, 15):
+        array_hook: Any
     object_hook: Any
     object_pairs_hook: Any
     parse_int: Any
@@ -48,4 +51,9 @@ class make_scanner:
 
 def encode_basestring(s: str, /) -> str: ...
 def encode_basestring_ascii(s: str, /) -> str: ...
-def scanstring(string: str, end: int, strict: bool = True) -> tuple[str, int]: ...
+
+if sys.version_info >= (3, 15):
+    def scanstring(pystr: str, end: int, strict: bool = True, /) -> tuple[str, int]: ...
+
+else:
+    def scanstring(string: str, end: int, strict: bool = True) -> tuple[str, int]: ...

stdlib/json/__init__.pyi

@@ -1,3 +1,4 @@
+import sys
 from _typeshed import SupportsRead, SupportsWrite
 from collections.abc import Callable
 from typing import Any, Literal
@@ -36,28 +37,57 @@ def dump(
     sort_keys: bool = False,
     **kwds: Any,
 ) -> None: ...
-def loads(
-    s: str | bytes | bytearray,
-    *,
-    cls: type[JSONDecoder] | None = None,
-    object_hook: Callable[[dict[Any, Any]], Any] | None = None,
-    parse_float: Callable[[str], Any] | None = None,
-    parse_int: Callable[[str], Any] | None = None,
-    parse_constant: Callable[[str], Any] | None = None,
-    object_pairs_hook: Callable[[list[tuple[Any, Any]]], Any] | None = None,
-    **kwds: Any,
-) -> Any: ...
-def load(
-    fp: SupportsRead[str | bytes],
-    *,
-    cls: type[JSONDecoder] | None = None,
-    object_hook: Callable[[dict[Any, Any]], Any] | None = None,
-    parse_float: Callable[[str], Any] | None = None,
-    parse_int: Callable[[str], Any] | None = None,
-    parse_constant: Callable[[str], Any] | None = None,
-    object_pairs_hook: Callable[[list[tuple[Any, Any]]], Any] | None = None,
-    **kwds: Any,
-) -> Any: ...
+
+if sys.version_info >= (3, 15):
+    def loads(
+        s: str | bytes | bytearray,
+        *,
+        cls: type[JSONDecoder] | None = None,
+        object_hook: Callable[[dict[Any, Any]], Any] | None = None,
+        parse_float: Callable[[str], Any] | None = None,
+        parse_int: Callable[[str], Any] | None = None,
+        parse_constant: Callable[[str], Any] | None = None,
+        object_pairs_hook: Callable[[list[tuple[Any, Any]]], Any] | None = None,
+        array_hook: Callable[[list[Any]], Any] | None = None,
+        **kwds: Any,
+    ) -> Any: ...
+    def load(
+        fp: SupportsRead[str | bytes],
+        *,
+        cls: type[JSONDecoder] | None = None,
+        object_hook: Callable[[dict[Any, Any]], Any] | None = None,
+        parse_float: Callable[[str], Any] | None = None,
+        parse_int: Callable[[str], Any] | None = None,
+        parse_constant: Callable[[str], Any] | None = None,
+        object_pairs_hook: Callable[[list[tuple[Any, Any]]], Any] | None = None,
+        array_hook: Callable[[list[Any]], Any] | None = None,
+        **kwds: Any,
+    ) -> Any: ...
+
+else:
+    def loads(
+        s: str | bytes | bytearray,
+        *,
+        cls: type[JSONDecoder] | None = None,
+        object_hook: Callable[[dict[Any, Any]], Any] | None = None,
+        parse_float: Callable[[str], Any] | None = None,
+        parse_int: Callable[[str], Any] | None = None,
+        parse_constant: Callable[[str], Any] | None = None,
+        object_pairs_hook: Callable[[list[tuple[Any, Any]]], Any] | None = None,
+        **kwds: Any,
+    ) -> Any: ...
+    def load(
+        fp: SupportsRead[str | bytes],
+        *,
+        cls: type[JSONDecoder] | None = None,
+        object_hook: Callable[[dict[Any, Any]], Any] | None = None,
+        parse_float: Callable[[str], Any] | None = None,
+        parse_int: Callable[[str], Any] | None = None,
+        parse_constant: Callable[[str], Any] | None = None,
+        object_pairs_hook: Callable[[list[tuple[Any, Any]]], Any] | None = None,
+        **kwds: Any,
+    ) -> Any: ...
+
 def detect_encoding(
     b: bytes | bytearray,
 ) -> Literal["utf-8", "utf-8-sig", "utf-16", "utf-16-be", "utf-16-le", "utf-32", "utf-32-be", "utf-32-le"]: ...  # undocumented

stdlib/json/decoder.pyi

@@ -1,3 +1,4 @@
+import sys
 from collections.abc import Callable
 from typing import Any
 
@@ -12,21 +13,38 @@ class JSONDecodeError(ValueError):
     def __init__(self, msg: str, doc: str, pos: int) -> None: ...
 
 class JSONDecoder:
+    if sys.version_info >= (3, 15):
+        array_hook: Callable[[list[Any]], Any] | None
     object_hook: Callable[[dict[str, Any]], Any]
     parse_float: Callable[[str], Any]
     parse_int: Callable[[str], Any]
     parse_constant: Callable[[str], Any]
     strict: bool
     object_pairs_hook: Callable[[list[tuple[str, Any]]], Any]
-    def __init__(
-        self,
-        *,
-        object_hook: Callable[[dict[str, Any]], Any] | None = None,
-        parse_float: Callable[[str], Any] | None = None,
-        parse_int: Callable[[str], Any] | None = None,
-        parse_constant: Callable[[str], Any] | None = None,
-        strict: bool = True,
-        object_pairs_hook: Callable[[list[tuple[str, Any]]], Any] | None = None,
-    ) -> None: ...
+    if sys.version_info >= (3, 15):
+        def __init__(
+            self,
+            *,
+            object_hook: Callable[[dict[str, Any]], Any] | None = None,
+            parse_float: Callable[[str], Any] | None = None,
+            parse_int: Callable[[str], Any] | None = None,
+            parse_constant: Callable[[str], Any] | None = None,
+            strict: bool = True,
+            object_pairs_hook: Callable[[list[tuple[str, Any]]], Any] | None = None,
+            array_hook: Callable[[list[Any]], Any] | None = None,
+        ) -> None: ...
+
+    else:
+        def __init__(
+            self,
+            *,
+            object_hook: Callable[[dict[str, Any]], Any] | None = None,
+            parse_float: Callable[[str], Any] | None = None,
+            parse_int: Callable[[str], Any] | None = None,
+            parse_constant: Callable[[str], Any] | None = None,
+            strict: bool = True,
+            object_pairs_hook: Callable[[list[tuple[str, Any]]], Any] | None = None,
+        ) -> None: ...
+
     def decode(self, s: str, _w: Callable[..., Any] = ...) -> Any: ...  # _w is undocumented
     def raw_decode(self, s: str, idx: int = 0) -> tuple[Any, int]: ...