blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

PyAPI: Avoid redundant prefix for PyC_Err_Format_Prefix 

Only show the exception value type when it's not a string.
This commit is contained in:
Campbell Barton 2019-01-17 08:43:57 +11:00
parent debb68024e
commit 9bfc9d799e
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/python/generic/py_capi_utils.c
View File

@ -436,17 +436,24 @@ PyObject *PyC_Err_Format_Prefix(PyObject *exception_type_prefix, const char *for
if (PyErr_Occurred()) {
PyObject *error_type, *error_value, *error_traceback;
PyErr_Fetch(&error_type, &error_value, &error_traceback);
PyErr_Format(exception_type_prefix,
"%S, %.200s(%S)",
error_value_prefix,
Py_TYPE(error_value)->tp_name,
error_value
);
if (PyUnicode_Check(error_value)) {
PyErr_Format(exception_type_prefix,
"%S, %S",
error_value_prefix,
error_value);
}
else {
PyErr_Format(exception_type_prefix,
"%S, %.200s(%S)",
error_value_prefix,
Py_TYPE(error_value)->tp_name,
error_value);
}
}
else {
PyErr_SetObject(exception_type_prefix,
error_value_prefix
);
error_value_prefix);
}
Py_XDECREF(error_value_prefix);