Issue #13444: When stdout has been closed explicitly, we should not attempt to flush it at shutdown and print an error.
This also adds a test for issue #5319, whose resolution introduced the issue.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index bea7fe1..fe92d30 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -332,6 +332,22 @@
/* Flush stdout and stderr */
+static int
+file_is_closed(PyObject *fobj)
+{
+ int r;
+ PyObject *tmp = PyObject_GetAttrString(fobj, "closed");
+ if (tmp == NULL) {
+ PyErr_Clear();
+ return 0;
+ }
+ r = PyObject_IsTrue(tmp);
+ Py_DECREF(tmp);
+ if (r < 0)
+ PyErr_Clear();
+ return r > 0;
+}
+
static void
flush_std_files(void)
{
@@ -339,7 +355,7 @@
PyObject *ferr = PySys_GetObject("stderr");
PyObject *tmp;
- if (fout != NULL && fout != Py_None) {
+ if (fout != NULL && fout != Py_None && !file_is_closed(fout)) {
tmp = PyObject_CallMethod(fout, "flush", "");
if (tmp == NULL)
PyErr_WriteUnraisable(fout);
@@ -347,7 +363,7 @@
Py_DECREF(tmp);
}
- if (ferr != NULL && ferr != Py_None) {
+ if (ferr != NULL && ferr != Py_None && !file_is_closed(ferr)) {
tmp = PyObject_CallMethod(ferr, "flush", "");
if (tmp == NULL)
PyErr_Clear();