gh-111495: Add more tests on PyEval C APIs (#122789)

* Add Lib/test/test_capi/test_eval.py
* Add Modules/_testlimitedcapi/eval.c

diff --git a/Lib/test/test_capi/test_eval.py b/Lib/test/test_capi/test_eval.py
new file mode 100644 (file)
index 0000000..20ef269
--- /dev/null
+++ b/Lib/test/test_capi/test_eval.py
@@ -0,0 +1,103 @@
+import sys
+import unittest
+from test.support import import_helper
+
+_testlimitedcapi = import_helper.import_module('_testlimitedcapi')
+
+
+class Tests(unittest.TestCase):
+    def test_eval_get_func_name(self):
+        eval_get_func_name = _testlimitedcapi.eval_get_func_name
+
+        def function_example(): ...
+
+        class A:
+            def method_example(self): ...
+
+        self.assertEqual(eval_get_func_name(function_example),
+                         "function_example")
+        self.assertEqual(eval_get_func_name(A.method_example),
+                         "method_example")
+        self.assertEqual(eval_get_func_name(A().method_example),
+                         "method_example")
+        self.assertEqual(eval_get_func_name(sum), "sum")  # c function
+        self.assertEqual(eval_get_func_name(A), "type")
+
+    def test_eval_get_func_desc(self):
+        eval_get_func_desc = _testlimitedcapi.eval_get_func_desc
+
+        def function_example(): ...
+
+        class A:
+            def method_example(self): ...
+
+        self.assertEqual(eval_get_func_desc(function_example),
+                         "()")
+        self.assertEqual(eval_get_func_desc(A.method_example),
+                         "()")
+        self.assertEqual(eval_get_func_desc(A().method_example),
+                         "()")
+        self.assertEqual(eval_get_func_desc(sum), "()")  # c function
+        self.assertEqual(eval_get_func_desc(A), " object")
+
+    def test_eval_getlocals(self):
+        # Test PyEval_GetLocals()
+        x = 1
+        self.assertEqual(_testlimitedcapi.eval_getlocals(),
+            {'self': self,
+             'x': 1})
+
+        y = 2
+        self.assertEqual(_testlimitedcapi.eval_getlocals(),
+            {'self': self,
+             'x': 1,
+             'y': 2})
+
+    def test_eval_getglobals(self):
+        # Test PyEval_GetGlobals()
+        self.assertEqual(_testlimitedcapi.eval_getglobals(),
+                         globals())
+
+    def test_eval_getbuiltins(self):
+        # Test PyEval_GetBuiltins()
+        self.assertEqual(_testlimitedcapi.eval_getbuiltins(),
+                         globals()['__builtins__'])
+
+    def test_eval_getframe(self):
+        # Test PyEval_GetFrame()
+        self.assertEqual(_testlimitedcapi.eval_getframe(),
+                         sys._getframe())
+
+    def test_eval_getframe_builtins(self):
+        # Test PyEval_GetFrameBuiltins()
+        self.assertEqual(_testlimitedcapi.eval_getframe_builtins(),
+                         sys._getframe().f_builtins)
+
+    def test_eval_getframe_globals(self):
+        # Test PyEval_GetFrameGlobals()
+        self.assertEqual(_testlimitedcapi.eval_getframe_globals(),
+                         sys._getframe().f_globals)
+
+    def test_eval_getframe_locals(self):
+        # Test PyEval_GetFrameLocals()
+        self.assertEqual(_testlimitedcapi.eval_getframe_locals(),
+                         sys._getframe().f_locals)
+
+    def test_eval_get_recursion_limit(self):
+        # Test Py_GetRecursionLimit()
+        self.assertEqual(_testlimitedcapi.eval_get_recursion_limit(),
+                         sys.getrecursionlimit())
+
+    def test_eval_set_recursion_limit(self):
+        # Test Py_SetRecursionLimit()
+        old_limit = sys.getrecursionlimit()
+        try:
+            limit = old_limit + 123
+            _testlimitedcapi.eval_set_recursion_limit(limit)
+            self.assertEqual(sys.getrecursionlimit(), limit)
+        finally:
+            sys.setrecursionlimit(old_limit)
+
+
+if __name__ == "__main__":
+    unittest.main()

diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
index be6fe0c1fb43dec595b87f7990cdd92b5fe86034..b103bf2450bde040b0085725972276d3fb907176 100644 (file)
--- a/Lib/test/test_capi/test_misc.py
+++ b/Lib/test/test_capi/test_misc.py
@@ -869,36 +869,6 @@ class CAPITest(unittest.TestCase):
         _testcapi.clear_managed_dict(c)
         self.assertEqual(c.__dict__, {})
 
-    def test_eval_get_func_name(self):
-        def function_example(): ...
-
-        class A:
-            def method_example(self): ...
-
-        self.assertEqual(_testcapi.eval_get_func_name(function_example),
-                         "function_example")
-        self.assertEqual(_testcapi.eval_get_func_name(A.method_example),
-                         "method_example")
-        self.assertEqual(_testcapi.eval_get_func_name(A().method_example),
-                         "method_example")
-        self.assertEqual(_testcapi.eval_get_func_name(sum), "sum")  # c function
-        self.assertEqual(_testcapi.eval_get_func_name(A), "type")
-
-    def test_eval_get_func_desc(self):
-        def function_example(): ...
-
-        class A:
-            def method_example(self): ...
-
-        self.assertEqual(_testcapi.eval_get_func_desc(function_example),
-                         "()")
-        self.assertEqual(_testcapi.eval_get_func_desc(A.method_example),
-                         "()")
-        self.assertEqual(_testcapi.eval_get_func_desc(A().method_example),
-                         "()")
-        self.assertEqual(_testcapi.eval_get_func_desc(sum), "()")  # c function
-        self.assertEqual(_testcapi.eval_get_func_desc(A), " object")
-
     def test_function_get_code(self):
         import types
 
@@ -1157,19 +1127,6 @@ class CAPITest(unittest.TestCase):
         gen = genf()
         self.assertEqual(_testcapi.gen_get_code(gen), gen.gi_code)
 
-    def test_pyeval_getlocals(self):
-        # Test PyEval_GetLocals()
-        x = 1
-        self.assertEqual(_testcapi.pyeval_getlocals(),
-            {'self': self,
-             'x': 1})
-
-        y = 2
-        self.assertEqual(_testcapi.pyeval_getlocals(),
-            {'self': self,
-             'x': 1,
-             'y': 2})
-
 
 @requires_limited_api
 class TestHeapTypeRelative(unittest.TestCase):

diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
index dfc75077650df810dc79c2d9fd0a05e7cb51f24f..9da4e7858048865189698899755b515b6dbc2a2a 100644 (file)
--- a/Modules/Setup.stdlib.in
+++ b/Modules/Setup.stdlib.in
@@ -163,7 +163,7 @@
 @MODULE__TESTBUFFER_TRUE@_testbuffer _testbuffer.c
 @MODULE__TESTINTERNALCAPI_TRUE@_testinternalcapi _testinternalcapi.c _testinternalcapi/test_lock.c _testinternalcapi/pytime.c _testinternalcapi/set.c _testinternalcapi/test_critical_sections.c
 @MODULE__TESTCAPI_TRUE@_testcapi _testcapimodule.c _testcapi/vectorcall.c _testcapi/heaptype.c _testcapi/abstract.c _testcapi/unicode.c _testcapi/dict.c _testcapi/set.c _testcapi/list.c _testcapi/tuple.c _testcapi/getargs.c _testcapi/datetime.c _testcapi/docstring.c _testcapi/mem.c _testcapi/watchers.c _testcapi/long.c _testcapi/float.c _testcapi/complex.c _testcapi/numbers.c _testcapi/structmember.c _testcapi/exceptions.c _testcapi/code.c _testcapi/buffer.c _testcapi/pyatomic.c _testcapi/run.c _testcapi/file.c _testcapi/codec.c _testcapi/immortal.c _testcapi/gc.c _testcapi/hash.c _testcapi/time.c _testcapi/bytes.c _testcapi/object.c _testcapi/monitoring.c
-@MODULE__TESTLIMITEDCAPI_TRUE@_testlimitedcapi _testlimitedcapi.c _testlimitedcapi/abstract.c _testlimitedcapi/bytearray.c _testlimitedcapi/bytes.c _testlimitedcapi/complex.c _testlimitedcapi/dict.c _testlimitedcapi/float.c _testlimitedcapi/heaptype_relative.c _testlimitedcapi/list.c _testlimitedcapi/long.c _testlimitedcapi/object.c _testlimitedcapi/pyos.c _testlimitedcapi/set.c _testlimitedcapi/sys.c _testlimitedcapi/unicode.c _testlimitedcapi/vectorcall_limited.c
+@MODULE__TESTLIMITEDCAPI_TRUE@_testlimitedcapi _testlimitedcapi.c _testlimitedcapi/abstract.c _testlimitedcapi/bytearray.c _testlimitedcapi/bytes.c _testlimitedcapi/complex.c _testlimitedcapi/dict.c _testlimitedcapi/eval.c _testlimitedcapi/float.c _testlimitedcapi/heaptype_relative.c _testlimitedcapi/list.c _testlimitedcapi/long.c _testlimitedcapi/object.c _testlimitedcapi/pyos.c _testlimitedcapi/set.c _testlimitedcapi/sys.c _testlimitedcapi/unicode.c _testlimitedcapi/vectorcall_limited.c
 @MODULE__TESTCLINIC_TRUE@_testclinic _testclinic.c
 @MODULE__TESTCLINIC_LIMITED_TRUE@_testclinic_limited _testclinic_limited.c
 

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 05deb0549fa637f9f81244e60c444881f608de41..981efb9629031be76c09bc195ccb2bbf33118319 100644 (file)
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -2655,18 +2655,6 @@ test_frame_getvarstring(PyObject *self, PyObject *args)
 }
 
 
-static PyObject *
-eval_get_func_name(PyObject *self, PyObject *func)
-{
-    return PyUnicode_FromString(PyEval_GetFuncName(func));
-}
-
-static PyObject *
-eval_get_func_desc(PyObject *self, PyObject *func)
-{
-    return PyUnicode_FromString(PyEval_GetFuncDesc(func));
-}
-
 static PyObject *
 gen_get_code(PyObject *self, PyObject *gen)
 {
@@ -3341,12 +3329,6 @@ test_critical_sections(PyObject *module, PyObject *Py_UNUSED(args))
     Py_RETURN_NONE;
 }
 
-static PyObject *
-pyeval_getlocals(PyObject *module, PyObject *Py_UNUSED(args))
-{
-    return Py_XNewRef(PyEval_GetLocals());
-}
-
 static PyMethodDef TestMethods[] = {
     {"set_errno",               set_errno,                       METH_VARARGS},
     {"test_config",             test_config,                     METH_NOARGS},
@@ -3467,8 +3449,6 @@ static PyMethodDef TestMethods[] = {
     {"frame_new", frame_new, METH_VARARGS, NULL},
     {"frame_getvar", test_frame_getvar, METH_VARARGS, NULL},
     {"frame_getvarstring", test_frame_getvarstring, METH_VARARGS, NULL},
-    {"eval_get_func_name", eval_get_func_name, METH_O, NULL},
-    {"eval_get_func_desc", eval_get_func_desc, METH_O, NULL},
     {"gen_get_code", gen_get_code, METH_O, NULL},
     {"get_feature_macros", get_feature_macros, METH_NOARGS, NULL},
     {"test_code_api", test_code_api, METH_NOARGS, NULL},
@@ -3489,7 +3469,6 @@ static PyMethodDef TestMethods[] = {
     {"test_weakref_capi", test_weakref_capi, METH_NOARGS},
     {"function_set_warning", function_set_warning, METH_NOARGS},
     {"test_critical_sections", test_critical_sections, METH_NOARGS},
-    {"pyeval_getlocals", pyeval_getlocals, METH_NOARGS},
     {NULL, NULL} /* sentinel */
 };
 

diff --git a/Modules/_testlimitedcapi.c b/Modules/_testlimitedcapi.c
index fb5cdb6ca9e1d34e69df2efcfdfc763f4e8c2a73..2f1a25ae4519b3ba3ea57dd68eecdac27561713a 100644 (file)
--- a/Modules/_testlimitedcapi.c
+++ b/Modules/_testlimitedcapi.c
@@ -44,6 +44,9 @@ PyInit__testlimitedcapi(void)
     if (_PyTestLimitedCAPI_Init_Dict(mod) < 0) {
         return NULL;
     }
+    if (_PyTestLimitedCAPI_Init_Eval(mod) < 0) {
+        return NULL;
+    }
     if (_PyTestLimitedCAPI_Init_Float(mod) < 0) {
         return NULL;
     }

diff --git a/Modules/_testlimitedcapi/eval.c b/Modules/_testlimitedcapi/eval.c
new file mode 100644 (file)
index 0000000..6a0da07
--- /dev/null
+++ b/Modules/_testlimitedcapi/eval.c
@@ -0,0 +1,95 @@
+#include "parts.h"
+#include "util.h"
+
+static PyObject *
+eval_get_func_name(PyObject *self, PyObject *func)
+{
+    return PyUnicode_FromString(PyEval_GetFuncName(func));
+}
+
+static PyObject *
+eval_get_func_desc(PyObject *self, PyObject *func)
+{
+    return PyUnicode_FromString(PyEval_GetFuncDesc(func));
+}
+
+static PyObject *
+eval_getlocals(PyObject *module, PyObject *Py_UNUSED(args))
+{
+    return Py_XNewRef(PyEval_GetLocals());
+}
+
+static PyObject *
+eval_getglobals(PyObject *module, PyObject *Py_UNUSED(args))
+{
+    return Py_XNewRef(PyEval_GetGlobals());
+}
+
+static PyObject *
+eval_getbuiltins(PyObject *module, PyObject *Py_UNUSED(args))
+{
+    return Py_XNewRef(PyEval_GetBuiltins());
+}
+
+static PyObject *
+eval_getframe(PyObject *module, PyObject *Py_UNUSED(args))
+{
+    return Py_XNewRef(PyEval_GetFrame());
+}
+
+static PyObject *
+eval_getframe_builtins(PyObject *module, PyObject *Py_UNUSED(args))
+{
+    return Py_XNewRef(PyEval_GetFrameBuiltins());
+}
+
+static PyObject *
+eval_getframe_globals(PyObject *module, PyObject *Py_UNUSED(args))
+{
+    return Py_XNewRef(PyEval_GetFrameGlobals());
+}
+
+static PyObject *
+eval_getframe_locals(PyObject *module, PyObject *Py_UNUSED(args))
+{
+    return Py_XNewRef(PyEval_GetFrameLocals());
+}
+
+static PyObject *
+eval_get_recursion_limit(PyObject *module, PyObject *Py_UNUSED(args))
+{
+    int limit = Py_GetRecursionLimit();
+    return PyLong_FromLong(limit);
+}
+
+static PyObject *
+eval_set_recursion_limit(PyObject *module, PyObject *args)
+{
+    int limit;
+    if (!PyArg_ParseTuple(args, "i", &limit)) {
+        return NULL;
+    }
+    Py_SetRecursionLimit(limit);
+    Py_RETURN_NONE;
+}
+
+static PyMethodDef test_methods[] = {
+    {"eval_get_func_name", eval_get_func_name, METH_O, NULL},
+    {"eval_get_func_desc", eval_get_func_desc, METH_O, NULL},
+    {"eval_getlocals", eval_getlocals, METH_NOARGS},
+    {"eval_getglobals", eval_getglobals, METH_NOARGS},
+    {"eval_getbuiltins", eval_getbuiltins, METH_NOARGS},
+    {"eval_getframe", eval_getframe, METH_NOARGS},
+    {"eval_getframe_builtins", eval_getframe_builtins, METH_NOARGS},
+    {"eval_getframe_globals", eval_getframe_globals, METH_NOARGS},
+    {"eval_getframe_locals", eval_getframe_locals, METH_NOARGS},
+    {"eval_get_recursion_limit", eval_get_recursion_limit, METH_NOARGS},
+    {"eval_set_recursion_limit", eval_set_recursion_limit, METH_VARARGS},
+    {NULL},
+};
+
+int
+_PyTestLimitedCAPI_Init_Eval(PyObject *m)
+{
+    return PyModule_AddFunctions(m, test_methods);
+}

diff --git a/Modules/_testlimitedcapi/parts.h b/Modules/_testlimitedcapi/parts.h
index d5e590a8dcd679d118ba07508de43d39ac04869e..c5758605fb71facbcdbeb2f25d88ef0b9960c696 100644 (file)
--- a/Modules/_testlimitedcapi/parts.h
+++ b/Modules/_testlimitedcapi/parts.h
@@ -27,6 +27,7 @@ int _PyTestLimitedCAPI_Init_ByteArray(PyObject *module);
 int _PyTestLimitedCAPI_Init_Bytes(PyObject *module);
 int _PyTestLimitedCAPI_Init_Complex(PyObject *module);
 int _PyTestLimitedCAPI_Init_Dict(PyObject *module);
+int _PyTestLimitedCAPI_Init_Eval(PyObject *module);
 int _PyTestLimitedCAPI_Init_Float(PyObject *module);
 int _PyTestLimitedCAPI_Init_HeaptypeRelative(PyObject *module);
 int _PyTestLimitedCAPI_Init_Object(PyObject *module);

diff --git a/PCbuild/_testlimitedcapi.vcxproj b/PCbuild/_testlimitedcapi.vcxproj
index 252039d93103bdf6dc9c0a564478b8450a3be2b9..bcb2ce24fcb2bf22446095cd1eeb53d5a7472b4d 100644 (file)
--- a/PCbuild/_testlimitedcapi.vcxproj
+++ b/PCbuild/_testlimitedcapi.vcxproj
@@ -99,6 +99,7 @@
     <ClCompile Include="..\Modules\_testlimitedcapi\bytes.c" />
     <ClCompile Include="..\Modules\_testlimitedcapi\complex.c" />
     <ClCompile Include="..\Modules\_testlimitedcapi\dict.c" />
+    <ClCompile Include="..\Modules\_testlimitedcapi\eval.c" />
     <ClCompile Include="..\Modules\_testlimitedcapi\float.c" />
     <ClCompile Include="..\Modules\_testlimitedcapi\heaptype_relative.c" />
     <ClCompile Include="..\Modules\_testlimitedcapi\list.c" />

diff --git a/PCbuild/_testlimitedcapi.vcxproj.filters b/PCbuild/_testlimitedcapi.vcxproj.filters
index 7efbb0acf8f960868306f4eae7ebdf385ea60fdc..df3324b71b2f60f513caa02ec3aeaae6a9b7873a 100644 (file)
--- a/PCbuild/_testlimitedcapi.vcxproj.filters
+++ b/PCbuild/_testlimitedcapi.vcxproj.filters
@@ -14,6 +14,7 @@
     <ClCompile Include="..\Modules\_testlimitedcapi\bytes.c" />
     <ClCompile Include="..\Modules\_testlimitedcapi\complex.c" />
     <ClCompile Include="..\Modules\_testlimitedcapi\dict.c" />
+    <ClCompile Include="..\Modules\_testlimitedcapi\eval.c" />
     <ClCompile Include="..\Modules\_testlimitedcapi\float.c" />
     <ClCompile Include="..\Modules\_testlimitedcapi\heaptype_relative.c" />
     <ClCompile Include="..\Modules\_testlimitedcapi\list.c" />