bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

convert non-string pyoperator exceptions into strings if they are not already.

Browse Source
This commit is contained in:
Campbell Barton 2009-06-13 13:57:56 +00:00
parent d7e06a6d91
commit b592b6e8be
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/blender/python/intern/bpy_operator_wrap.c
View File

@ -140,12 +140,47 @@ static PyObject *pyop_dict_from_event(wmEvent *event)
/* TODO - a whole traceback would be ideal */
static void pyop_error_report(ReportList *reports)
{
const char *string;
PyObject *exception, *v, *tb;
PyErr_Fetch(&exception, &v, &tb);
if (exception == NULL)
return;
/* get the string from the exception */
if(v==NULL) {
string= "py exception not set";
}
else if(string = _PyUnicode_AsString(v)) {
/* do nothing */
}
else { /* a valid PyObject but not a string, try get its string value */
PyObject *repr;
Py_INCREF(v); /* incase clearing the error below somehow frees this */
PyErr_Clear();
repr= PyObject_Repr(v);
if(repr==NULL) {
PyErr_Clear();
string= "py exception found but can't be converted";
}
else {
string = _PyUnicode_AsString(repr);
Py_DECREF(repr);
if(string==NULL) { /* unlikely to happen */
PyErr_Clear();
string= "py exception found but can't be converted";
}
}
Py_DECREF(v); /* finished dealing with v, PyErr_Clear isnt called anymore so can decref it */
}
/* done getting the string */
/* Now we know v != NULL too */
BKE_report(reports, RPT_ERROR, _PyUnicode_AsString(v));
BKE_report(reports, RPT_ERROR, string);
PyErr_Print();
}