summaryrefslogtreecommitdiff
path: root/Python/errors.c
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-11-18 14:06:54 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2012-11-18 14:06:54 +0200
commit23e41c9686435a8a01da7fead079c783087ee5c5 (patch)
tree0593cf00b74bcabb8cb52c2108750c2f80fa2c81 /Python/errors.c
parent68a2b84e68c3fe3abaa1bae589e17bfbb13461c2 (diff)
parente93555d91c4608e06e3058a42af0f2450c9dfd19 (diff)
downloadcpython-23e41c9686435a8a01da7fead079c783087ee5c5.tar.gz
#16306: merge with 3.3.
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);