mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-02 15:07:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-36829: sys.excepthook and sys.unraisablehook flush (GH-13620)

Browse source 
sys.excepthook() and sys.unraisablehook() now explicitly flush the
file (usually sys.stderr).

If file.flush() fails, sys.excepthook() silently ignores the error,
whereas sys.unraisablehook() logs the new exception.
This commit is contained in:
Victor Stinner 2019-05-28 16:01:17 +02:00 • committed by GitHub
parent 51ddab8dae
commit a85a1d337d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Python/errors.c
View file

@ -26,6 +26,7 @@ extern "C" {
_Py_IDENTIFIER(builtins); _Py_IDENTIFIER(builtins);
_Py_IDENTIFIER(stderr); _Py_IDENTIFIER(stderr);
_Py_IDENTIFIER(flush);
/* Forward declarations */ /* Forward declarations */
@ -1254,6 +1255,14 @@ write_unraisable_exc_file(PyThreadState *tstate, PyObject *exc_type,
if (PyFile_WriteString("\n", file) < 0) { if (PyFile_WriteString("\n", file) < 0) {
return -1; return -1;
} }
/* Explicitly call file.flush() */
PyObject *res = _PyObject_CallMethodId(file, &PyId_flush, NULL);
if (!res) {
return -1;
}
Py_DECREF(res);
return 0; return 0;
} }

10
Python/pythonrun.c
View file

@ -978,6 +978,16 @@ _PyErr_Display(PyObject *file, PyObject *exception, PyObject *value, PyObject *t
} }
print_exception_recursive(file, value, seen); print_exception_recursive(file, value, seen);
Py_XDECREF(seen); Py_XDECREF(seen);
/* Call file.flush() */
PyObject *res = _PyObject_CallMethodId(file, &PyId_flush, NULL);
if (!res) {
/* Silently ignore file.flush() error */
PyErr_Clear();
}
else {
Py_DECREF(res);
}
} }
void void