diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2012-11-11 20:11:15 +0100 |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-11-11 20:11:15 +0100 |
commit | 58570e2a9e801c9d6758a79968e54d74f7ce0c45 (patch) | |
tree | f66bd116f1e85f3743868c514e6e8de1ce26812f /Python/errors.c | |
parent | 3b142536f70f81872eac135b55e0572429c5ab46 (diff) | |
parent | aae0fc1b4754dafd00a40c1c48e19e5e19b64343 (diff) | |
download | cpython-58570e2a9e801c9d6758a79968e54d74f7ce0c45.tar.gz |
Add a test for hashing of unaligned memory buffers (from issue #16427).
Diffstat (limited to 'Python/errors.c')
-rw-r--r-- | Python/errors.c | 15 |
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); |