Add pymain_error()

Author: vstinner

Modules/main.c

@@ -80,6 +80,14 @@ pymain_init(const _PyArgv *args)
 
 /* --- pymain_run_python() ---------------------------------------- */
 
+// See also pyrun_error()
+static void
+pymain_error(const char *msg)
+{
+    assert(strchr(msg, '\n') == NULL);
+    fprintf(stderr, "python: %s\n", msg);
+}
+
 static int
 pymain_check_signals(void)
 {
@@ -312,13 +320,13 @@ pymain_run_pyrepl(int pythonstartup)
 
     PyObject *pyrepl = PyImport_ImportModule("_pyrepl.main");
     if (pyrepl == NULL) {
-        fprintf(stderr, "Could not import _pyrepl.main\n");
+        pymain_error("Could not import _pyrepl.main");
         goto error;
     }
 
     console = PyObject_GetAttrString(pyrepl, "interactive_console");
     if (console == NULL) {
-        fprintf(stderr, "Could not access _pyrepl.main.interactive_console\n");
+        pymain_error("Could not access _pyrepl.main.interactive_console");
         goto error;
     }
 
@@ -379,20 +387,20 @@ pymain_run_module(const wchar_t *modname, int set_argv0)
     runmodule = PyImport_ImportModuleAttrString("runpy",
                                                 "_run_module_as_main");
     if (runmodule == NULL) {
-        fprintf(stderr, "Could not import runpy._run_module_as_main\n");
+        pymain_error("Could not import runpy._run_module_as_main");
         goto error;
     }
 
     module = PyUnicode_FromWideChar(modname, -1);
     if (module == NULL) {
-        fprintf(stderr, "Could not convert module name to unicode\n");
+        pymain_error("Could not convert module name to unicode");
         goto error;
     }
 
     runargs = _PyTuple_FromPair(module, set_argv0 ? Py_True : Py_False);
     if (runargs == NULL) {
-        fprintf(stderr,
-            "Could not create arguments for runpy._run_module_as_main\n");
+        pymain_error("Could not create arguments "
+                     "for runpy._run_module_as_main");
         goto error;
     }
 
@@ -593,7 +601,7 @@ pymain_set_inspect(PyConfig *config, int inspect, int *exitcode)
     PyObject *value = PyLong_FromLong(inspect);
     if (value == NULL || PyConfig_Set("inspect", value) < 0) {
         Py_XDECREF(value);
-        fprintf(stderr, "Could not set the inspect flag\n");
+        pymain_error("Could not set the inspect flag");
         return pymain_err_print(exitcode);
     }
     else {
@@ -626,7 +634,7 @@ _pymain_run_repl(PyConfig *config, int startup)
         }
 
         if (!PyErr_ExceptionMatches(PyExc_ModuleNotFoundError)) {
-            fprintf(stderr, "Could not import _pyrepl.main\n");
+            pymain_error("Could not import _pyrepl.main");
             goto error;
         }
         PyErr_Clear();

Python/pythonrun.c

@@ -60,6 +60,15 @@ _PyRun_File(FILE *fp, PyObject *filename, int start, PyObject *globals,
             PyObject *locals, int closeit, PyCompilerFlags *flags);
 
 
+// See also pymain_error()
+static void
+pyrun_error(const char *msg)
+{
+    assert(strchr(msg, '\n') == NULL);
+    fprintf(stderr, "python: %s\n", msg);
+}
+
+
 PyObject*
 _PyRun_AnyFile(FILE *fp, PyObject *filename, int closeit,
                PyCompilerFlags *flags)
@@ -496,7 +505,7 @@ _PyRun_SimpleFile(FILE *fp, PyObject *filename, int closeit,
     }
     if (!has_file) {
         if (PyDict_SetItemString(dict, "__file__", filename) < 0) {
-            fprintf(stderr, "python: failed to set __main__.__file__\n");
+            pyrun_error("failed to set __main__.__file__");
             goto done;
         }
         set_file_name = 1;
@@ -516,12 +525,12 @@ _PyRun_SimpleFile(FILE *fp, PyObject *filename, int closeit,
 
         pyc_fp = Py_fopen(filename, "rb");
         if (pyc_fp == NULL) {
-            fprintf(stderr, "python: Can't reopen .pyc file\n");
+            pyrun_error("Can't reopen .pyc file");
             goto done;
         }
 
         if (set_main_loader(dict, filename, "SourcelessFileLoader") < 0) {
-            fprintf(stderr, "python: failed to set __main__.__loader__\n");
+            pyrun_error("failed to set __main__.__loader__");
             fclose(pyc_fp);
             goto done;
         }
@@ -530,7 +539,7 @@ _PyRun_SimpleFile(FILE *fp, PyObject *filename, int closeit,
         /* When running from stdin, leave __main__.__loader__ alone */
         if ((!PyUnicode_Check(filename) || !PyUnicode_EqualToUTF8(filename, "<stdin>")) &&
             set_main_loader(dict, filename, "SourceFileLoader") < 0) {
-            fprintf(stderr, "python: failed to set __main__.__loader__\n");
+            pyrun_error("failed to set __main__.__loader__");
             goto done;
         }
         res = _PyRun_File(fp, filename, Py_file_input, dict, dict,
@@ -541,7 +550,7 @@ _PyRun_SimpleFile(FILE *fp, PyObject *filename, int closeit,
   done:
     if (set_file_name) {
         if (PyDict_PopString(dict, "__file__", NULL) < 0) {
-            fprintf(stderr, "python: failed to delete __main__.__file__\n");
+            pyrun_error("failed to delete __main__.__file__");
             Py_CLEAR(res);
         }
     }