Issue #3798: sys.exit(message) writes the message to sys.stderr file, instead

of the C file stderr, to use stderr encoding and error handler

1 files changed, 6 insertions, 4 deletions

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index b469c4a625..1581c90fb3 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1386,10 +1386,12 @@ handle_system_exit(void)
         exitcode = (int)PyLong_AsLong(value);
     else {
         PyObject *sys_stderr = PySys_GetObject("stderr");
-        if (sys_stderr != NULL)
-            PyObject_CallMethod(sys_stderr, "flush", NULL);
-        PyObject_Print(value, stderr, Py_PRINT_RAW);
-        fflush(stderr);
+        if (sys_stderr != NULL && sys_stderr != Py_None) {
+            PyFile_WriteObject(value, sys_stderr, Py_PRINT_RAW);
+        } else {
+            PyObject_Print(value, stderr, Py_PRINT_RAW);
+            fflush(stderr);
+        }
         PySys_WriteStderr("\n");
         exitcode = 1;
     }