From 467ab194fc6189d9f7310c89937c51abeac56839 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Fri, 21 Oct 2016 17:09:17 +0300 Subject: Issue #28410: Added _PyErr_FormatFromCause() -- the helper for raising new exception with setting current exception as __cause__. _PyErr_FormatFromCause(exception, format, args...) is equivalent to Python raise exception(format % args) from sys.exc_info()[1] --- Objects/unicodeobject.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Objects/unicodeobject.c') diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index adeec8cca6..80e6cf26f8 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -3835,13 +3835,10 @@ PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size) Py_FileSystemDefaultEncodeErrors); #ifdef MS_WINDOWS if (!res && PyErr_ExceptionMatches(PyExc_UnicodeDecodeError)) { - PyObject *exc, *val, *tb; - PyErr_Fetch(&exc, &val, &tb); - PyErr_Format(PyExc_RuntimeError, - "filesystem path bytes were not correctly encoded with '%s'. " \ + _PyErr_FormatFromCause(PyExc_RuntimeError, + "filesystem path bytes were not correctly encoded with '%s'. " "Please report this at http://bugs.python.org/issue27781", Py_FileSystemDefaultEncoding); - _PyErr_ChainExceptions(exc, val, tb); } #endif return res; -- cgit v1.2.1