Mercurial > cpython-lru_cache-weakref
diff Python/pythonrun.c @ 61922:8dbbd90eeda8 2.6
Merged revisions 81537 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81537 | victor.stinner | 2010-05-26 00:30:32 +0200 (mer., 26 mai 2010) | 3 lines
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
........
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Tue, 25 May 2010 22:40:38 +0000 |
| parents | e38335d4df91 |
| children | 787b969d37f0 |
line wrap: on
line diff
--- a/Python/pythonrun.c Tue May 25 19:47:22 2010 +0000 +++ b/Python/pythonrun.c Tue May 25 22:40:38 2010 +0000 @@ -1111,7 +1111,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; }