[test] catch RecursionError on higher python versions

Author: fangq

coverage_test.sh

@@ -11,9 +11,9 @@ rm -rf coverage/{c,python}
 
 # Coverage should be measured with extension compiled for both Python 2 & 3 (e.g. via separate venv)
 export CFLAGS="-coverage"
-python3 setup.py build_ext -i
-python3 -mcoverage run --branch --omit=bjdata/compat.py -m unittest discover test/ -vf
-python3 -mcoverage html -d coverage/python
+python setup.py build_ext -i
+python -mcoverage run --branch --omit=bjdata/compat.py -m unittest discover test/ -vf
+python -mcoverage html -d coverage/python
 lcov --capture --directory . --output-file /tmp/bjdata-coverage.info.pre
 # Only consider own source files. (Unfortunately extract/remove commands seem incapable of reading from stdin)
 lcov --extract /tmp/bjdata-coverage.info.pre "$(pwd)/src/*" --output-file /tmp/bjdata-coverage.info.pre2

test/perf.py

@@ -34,7 +34,6 @@
 
 
 class LibWrapper(object):
-
     __metaclass__ = ABCMeta
 
     @staticmethod

test/test.py

@@ -946,7 +946,9 @@ def test_decoder_fuzz(self):
                     self.bjdloadb(pack(fmt, i))
                 except DecoderException:
                     pass
-                except Exception as ex:  # pragma: no cover  pylint: disable=broad-except
+                except (
+                    Exception
+                ) as ex:  # pragma: no cover  pylint: disable=broad-except
                     self.fail("Unexpected failure: %s" % ex)
 
     def assert_raises_regex(self, *args, **kwargs):
@@ -958,18 +960,25 @@ def assert_raises_regex(self, *args, **kwargs):
     def test_recursion(self):
         old_limit = getrecursionlimit()
         setrecursionlimit(200)
+        if version_info >= (3, 5):
+            # Python 3.5+ has RecursionError
+            recursion_exceptions = (RuntimeError, RecursionError)
+        else:
+            # Python 2.7 and early Python 3.x only have RuntimeError
+            recursion_exceptions = (RuntimeError,)
+
         try:
             obj = current = []
-            # Increase the multiplier for Python 3.12+
-            multiplier = 4 if version_info >= (3, 12) else 2
-            for _ in range(getrecursionlimit() * multiplier):
+            for _ in range(getrecursionlimit() * 2):
                 new_list = []
                 current.append(new_list)
                 current = new_list
-            with self.assert_raises_regex(RuntimeError, "recursion"):
+
+            with self.assert_raises_regex(recursion_exceptions, "recursion"):
                 self.bjddumpb(obj)
-            raw = ARRAY_START * (getrecursionlimit() * multiplier)
-            with self.assert_raises_regex(RuntimeError, "recursion"):
+
+            raw = ARRAY_START * (getrecursionlimit() * 2)
+            with self.assert_raises_regex(recursion_exceptions, "recursion"):
                 self.bjdloadb(raw)
         finally:
             setrecursionlimit(old_limit)