Raise JSONSyntaxError instead of RecursionError

docs/source/changelog.rst

@@ -25,6 +25,7 @@ jsonyx 2.0.0 (unreleased)
 - Added :func:`jsonyx.paste_values`
 - Added :func:`jsonyx.Manipulator`
 - Changed error for big integers to :exc:`jsonyx.JSONSyntaxError`
+- Changed error for deep nesting to :exc:`jsonyx.JSONSyntaxError`
 - Fixed line comment detection
 - Fixed spelling of "commas" in error messages
 - Fixed ``end_offset`` of :exc:`jsonyx.JSONSyntaxError`

src/jsonyx/__init__.py

@@ -118,7 +118,6 @@ def read(
     :param hooks: the :ref:`hooks <using_hooks>` used for transforming data
     :param use_decimal: use :class:`decimal.Decimal` instead of :class:`float`
     :raises JSONSyntaxError: if the JSON file is invalid
-    :raises RecursionError: if the JSON file is too deeply nested
     :raises UnicodeDecodeError: when failing to decode the file
     :return: a Python object.
 
@@ -157,7 +156,6 @@ def load(
     :param root: the path to the archive containing this JSON file
     :param use_decimal: use :class:`decimal.Decimal` instead of :class:`float`
     :raises JSONSyntaxError: if the JSON file is invalid
-    :raises RecursionError: if the JSON file is too deeply nested
     :raises UnicodeDecodeError: when failing to decode the file
     :return: a Python object
 
@@ -192,7 +190,6 @@ def loads(
     :param hooks: the :ref:`hooks <using_hooks>` used for transforming data
     :param use_decimal: use :class:`decimal.Decimal` instead of :class:`float`
     :raises JSONSyntaxError: if the JSON string is invalid
-    :raises RecursionError: if the JSON string is too deeply nested
     :raises UnicodeDecodeError: when failing to decode the string
     :return: a Python object
 

src/jsonyx/_decoder.py

@@ -530,9 +530,17 @@ def scan_value(filename: str, s: str, idx: int) -> tuple[Any, int]:
             if nextchar == '"':
                 value, end = scan_string(filename, s, idx + 1)
             elif nextchar == "{":
-                value, end = scan_object(filename, s, idx + 1)
+                try:
+                    value, end = scan_object(filename, s, idx + 1)
+                except RecursionError:
+                    msg = "Object is too deeply nested"
+                    raise _errmsg(msg, filename, s, idx) from None
             elif nextchar == "[":
-                value, end = scan_array(filename, s, idx + 1)
+                try:
+                    value, end = scan_array(filename, s, idx + 1)
+                except RecursionError:
+                    msg = "Array is too deeply nested"
+                    raise _errmsg(msg, filename, s, idx) from None
             elif nextchar == "n" and s[idx:idx + 4] == "null":
                 value, end = None, idx + 4
             elif nextchar == "t" and s[idx:idx + 4] == "true":
@@ -649,7 +657,6 @@ def read(self, filename: _StrPath) -> Any:
 
         :param filename: the path to the JSON file
         :raises JSONSyntaxError: if the JSON file is invalid
-        :raises RecursionError: if the JSON file is too deeply nested
         :raises UnicodeDecodeError: when failing to decode the file
         :return: a Python object
 
@@ -675,7 +682,6 @@ def load(
         :param fp: an open JSON file
         :param root: the path to the archive containing this JSON file
         :raises JSONSyntaxError: if the JSON file is invalid
-        :raises RecursionError: if the JSON file is too deeply nested
         :raises UnicodeDecodeError: when failing to decode the file
         :return: a Python object
 
@@ -702,7 +708,6 @@ def loads(
         :param s: a JSON string
         :param filename: the path to the JSON file
         :raises JSONSyntaxError: if the JSON string is invalid
-        :raises RecursionError: if the JSON string is too deeply nested
         :raises UnicodeDecodeError: when failing to decode the string
         :return: a Python object
 

src/jsonyx/_speedups.c

@@ -1094,6 +1094,11 @@ scan_once_unicode(PyScannerObject *s, PyObject *memo, PyObject *pyfilename, PyOb
                 return NULL;
             res = _parse_object_unicode(s, memo, pyfilename, pystr, idx + 1, next_idx_ptr);
             _Py_LeaveRecursiveCall();
+            if (PyErr_ExceptionMatches(PyExc_RecursionError)) {
+                PyErr_Clear();
+                raise_errmsg("Object is too deeply nested", pyfilename, pystr, idx, 0);
+                return NULL;
+            }
             return res;
         case '[':
             /* array */
@@ -1102,6 +1107,11 @@ scan_once_unicode(PyScannerObject *s, PyObject *memo, PyObject *pyfilename, PyOb
                 return NULL;
             res = _parse_array_unicode(s, memo, pyfilename, pystr, idx + 1, next_idx_ptr);
             _Py_LeaveRecursiveCall();
+            if (PyErr_ExceptionMatches(PyExc_RecursionError)) {
+                PyErr_Clear();
+                raise_errmsg("Array is too deeply nested", pyfilename, pystr, idx, 0);
+                return NULL;
+            }
             return res;
         case 'n':
             /* null */

src/jsonyx/test/test_loads.py

@@ -611,12 +611,18 @@ def test_trailing_comma(
     assert json.loads(s, allow=TRAILING_COMMA) == expected
 
 
-@pytest.mark.parametrize("start", ["[", '{"":'])
-def test_recursion(json: ModuleType, start: str) -> None:
+@pytest.mark.parametrize(("start", "msg"), [
+    ("[", "Array is too deeply nested"),
+    ('{"":', "Object is too deeply nested"),
+])
+def test_recursion(json: ModuleType, start: str, msg: str) -> None:
     """Test recursion."""
-    with pytest.raises(RecursionError):
+    with pytest.raises(json.JSONSyntaxError) as exc_info:
         json.loads(start * 100_000)
 
+    exc: Any = exc_info.value
+    assert exc.msg == msg
+
 
 @pytest.mark.parametrize("s", [
     # No whitespace