archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Correct own recent error printing Python exception

Browse Source
This commit is contained in:
Campbell Barton
2015-06-03 12:36:32 +10:00
parent fd8b6021c4
commit 2be3ebd15d
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/python/intern/bpy_util.c
View File

@@ -85,7 +85,6 @@ short BPy_reports_to_error(ReportList *reports, PyObject *exception, const bool
bool BPy_errors_to_report_ex(ReportList *reports, const bool use_full, const bool use_location)
{
PyObject *pystring;
const char *cstring;
if (!PyErr_Occurred())
return 1;
@@ -109,13 +108,12 @@ bool BPy_errors_to_report_ex(ReportList *reports, const bool use_full, const boo
return 0;
}
cstring = _PyUnicode_AsString(pystring);
if (use_location) {
const char *filename;
int lineno;
PyObject *pystring_format; /* workaround, see below */
const char *cstring;
PyC_FileAndNum(&filename, &lineno);
if (filename == NULL) {
@@ -128,14 +126,15 @@ bool BPy_errors_to_report_ex(ReportList *reports, const bool use_full, const boo
pystring_format = PyUnicode_FromFormat(TIP_("%s\nlocation: %s:%d\n"), cstring, filename, lineno);
cstring = _PyUnicode_AsString(pystring_format);
BKE_report(reports, RPT_ERROR, cstring);
Py_DECREF(pystring_format); /* workaround */
#endif
/* not exactly needed. just for testing */
fprintf(stderr, TIP_("%s\nlocation: %s:%d\n"), cstring, filename, lineno);
Py_DECREF(pystring_format); /* workaround */
#endif
}
else {
BKE_report(reports, RPT_ERROR, cstring);
BKE_report(reports, RPT_ERROR, _PyUnicode_AsString(pystring));
}