Update test

Author: StanFromIreland

Lib/test/test_pyexpat.py

@@ -701,19 +701,20 @@ def test_trigger_leak(self):
         parser.ElementDeclHandler = lambda _1, _2: None
         self.assertRaises(TypeError, parser.Parse, data, True)
 
+    @support.skip_if_unlimited_stack_size
+    @support.skip_emscripten_stack_overflow()
+    @support.skip_wasi_stack_overflow()
     def test_deeply_nested_content_model(self):
         data = ('<!DOCTYPE root [\n<!ELEMENT root '
-              + '(a, ' * 200000 + 'a'
-              + ')' * 200000
+              + '(a, ' * 500000 + 'a'
+              + ')' * 500000
               + '>\n]>\n<root/>\n').encode('UTF-8')
 
         parser = expat.ParserCreate()
         parser.ElementDeclHandler = lambda _1, _2: None
-        # This shouldn't crash:
-        try:
-            parser.ParseFile(BytesIO(data))
-        except RecursionError:
-            pass
+        with self.assertRaises(RecursionError):
+            with support.infinite_recursion():
+                parser.ParseFile(BytesIO(data))
 
 class MalformedInputTest(unittest.TestCase):
     def test1(self):

Modules/pyexpat.c

@@ -3,6 +3,7 @@
 #endif
 
 #include "Python.h"
+#include "pycore_ceval.h"         // _Py_EnterRecursiveCall()
 #include "pycore_import.h"        // _PyImport_SetModule()
 #include "pycore_pyhash.h"        // _Py_HashSecret
 #include "pycore_traceback.h"     // _PyTraceback_Add()
@@ -607,7 +608,7 @@ static PyObject *
 conv_content_model(XML_Content * const model,
                    PyObject *(*conv_string)(void *))
 {
-    if (Py_EnterRecursiveCall(" in conv_content_model")) {
+    if (_Py_EnterRecursiveCall(" in conv_content_model")) {
         return NULL;
     }
 
@@ -631,7 +632,7 @@ conv_content_model(XML_Content * const model,
                                conv_string, model->name, children);
     }
 done:
-    Py_LeaveRecursiveCall();
+    _Py_LeaveRecursiveCall();
     return result;
 }