summaryrefslogtreecommitdiff
path: root/Python/errors.c
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2012-11-10 22:34:18 -0800
committerGregory P. Smith <greg@krypto.org>2012-11-10 22:34:18 -0800
commit6d1e5b6dbf0e50dffd7a4af53904f67bfc86d78b (patch)
tree3da6891ce1e35684754667321ed36f2651dd571f /Python/errors.c
parent240b268e486885ebae6b6d2152b18d6780d4ab93 (diff)
parent22f9e65bb11ab8dee2562fe5bf4e19dc9ff87bf7 (diff)
downloadcpython-6d1e5b6dbf0e50dffd7a4af53904f67bfc86d78b.tar.gz
Fixes issue #16327: The subprocess module no longer leaks file descriptors
used for stdin/stdout/stderr pipes to the child when fork() fails.
Diffstat (limited to 'Python/errors.c')
-rw-r--r--Python/errors.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/Python/errors.c b/Python/errors.c
index 626b16e46f..a2d1a82ddf 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -798,7 +798,12 @@ PyErr_WriteUnraisable(PyObject *obj)
PyErr_Fetch(&t, &v, &tb);
f = PySys_GetObject("stderr");
if (f != NULL && f != Py_None) {
- PyFile_WriteString("Exception ", f);
+ if (obj) {
+ PyFile_WriteString("Exception ignored in: ", f);
+ PyFile_WriteObject(obj, f, 0);
+ PyFile_WriteString("\n", f);
+ }
+ PyTraceBack_Print(tb, f);
if (t) {
PyObject* moduleName;
char* className;
@@ -828,15 +833,11 @@ PyErr_WriteUnraisable(PyObject *obj)
PyFile_WriteString(className, f);
if (v && v != Py_None) {
PyFile_WriteString(": ", f);
- PyFile_WriteObject(v, f, 0);
+ PyFile_WriteObject(v, f, Py_PRINT_RAW);
}
+ PyFile_WriteString("\n", f);
Py_XDECREF(moduleName);
}
- if (obj) {
- PyFile_WriteString(" in ", f);
- PyFile_WriteObject(obj, f, 0);
- }
- PyFile_WriteString(" ignored\n", f);
PyErr_Clear(); /* Just in case */
}
Py_XDECREF(t);