cleanup (and rename)

serhiy-storchaka · May 2, 2024 · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024
commit f8e29ce732ec15974d2af2a1f364d3c6acf7ccf5
diff --git a/Lib/test/test_capi/test_pyrun.py b/Lib/test/test_capi/test_pyrun.py
@@ -28,7 +28,7 @@ def tearDown(self):
     def test_pyrun_fileexflags_with_differents_args(self):
 
         def check(*args):
-            res = _testcapi.eval_pyrun_fileexflags(self.filename, Py_file_input, *args)
+            res = _testcapi.run_fileexflags(self.filename, Py_file_input, *args)
             self.assertIsNone(res)
 
         check({}, NULL, 1, 0, 0)
@@ -41,7 +41,7 @@ def check(*args):
     def test_pyrun_fileexflags_globals_is_null(self):
         def check(*args):
             with self.assertRaises(SystemError):
-                _testcapi.eval_pyrun_fileexflags(self.filename, Py_file_input, *args)
+                _testcapi.run_fileexflags(self.filename, Py_file_input, *args)
 
         check(NULL, NULL, 1, 0, 0)
         check(NULL, {}, 1, 0, 0)

diff --git a/Modules/_testcapi/pyrun.c b/Modules/_testcapi/pyrun.c
@@ -4,23 +4,9 @@
 #include <stdio.h>
 #include <errno.h>
 
-char *filename = "pyrun_sample.py";
-
-/* XXX: Need to implement
-int PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit, PyCompilerFlags *flags)
-int PyRun_SimpleStringFlags(const char *command, PyCompilerFlags *flags)
-int PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit, PyCompilerFlags *flags)
-int PyRun_InteractiveOneFlags(FILE *fp, const char *filename, PyCompilerFlags *flags)
-int PyRun_InteractiveLoopFlags(FILE *fp, const char *filename, PyCompilerFlags *flags)
-PyObject *PyRun_StringFlags(const char *str, int start, PyObject *globals, PyObject *locals, PyCompilerFlags *flags)
-
-XXX: implemented
-PyObject *PyRun_FileExFlags(FILE *fp, const char *filename, int start, PyObject *globals, PyObject *locals, int closeit, PyCompilerFlags *flags)
-*/
-
 
 static PyObject *
-eval_pyrun_fileexflags(PyObject *mod, PyObject *pos_args)
+run_fileexflags(PyObject *mod, PyObject *pos_args)
 {
     PyObject *result = NULL;
     const char *filename = NULL;
@@ -92,7 +78,7 @@ eval_pyrun_fileexflags(PyObject *mod, PyObject *pos_args)
 }
 
 static PyMethodDef test_methods[] = {
-    {"eval_pyrun_fileexflags", eval_pyrun_fileexflags, METH_VARARGS},
+    {"run_fileexflags", run_fileexflags, METH_VARARGS},
     {NULL},
 };