Issue #3798: Write sys.exit() message to sys.stderr to use stderr encoding and
error handler, instead of writing to the C stderr file in utf-8
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index f203618..db5d0a7 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1106,7 +1106,13 @@
if (PyInt_Check(value))
exitcode = (int)PyInt_AsLong(value);
else {
- PyObject_Print(value, stderr, Py_PRINT_RAW);
+ PyObject *sys_stderr = PySys_GetObject("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;
}