sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

error when a python operator gave an incorrect return value was near useless, re-raise a more comprehensive error which includes the operator name.

Browse Source
This commit is contained in:
Campbell Barton 2011-08-25 17:54:30 +00:00
parent 166970f68e
commit 9436769cd4
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/intern/bpy_operator.c
View File

@ -293,7 +293,7 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
* function corrects bpy.data (internal Main pointer) */
BPY_modules_update(C);
/* needed for when WM_OT_read_factory_settings us called fro within a script */
/* needed for when WM_OT_read_factory_settings us called from within a script */
bpy_import_main_set(CTX_data_main(C));
/* return operator_ret as a bpy enum */

16
source/blender/python/intern/bpy_rna.c
View File

@ -6417,7 +6417,21 @@ static int bpy_class_call(bContext *C, PointerRNA *ptr, FunctionRNA *func, Param
err= -1;
}
else if(ret_len==1) {
err= pyrna_py_to_prop(&funcptr, pret_single, retdata_single, ret, "calling class function:");
err= pyrna_py_to_prop(&funcptr, pret_single, retdata_single, ret, "");
/* when calling operator funcs only gives Function.result with
* no line number since the func has finished calling on error,
* re-raise the exception with more info since it would be slow to
* create prefix on every call (when there are no errors) */
if(err == -1 && PyErr_Occurred()) {
PyObject *error_type, *error_value, *error_traceback;
PyErr_Fetch(&error_type, &error_value, &error_traceback);
PyErr_Format(error_type,
"expected class %.200s, function %.200s: incompatible return value%S",
RNA_struct_identifier(ptr->type), RNA_function_identifier(func),
error_value);
}
}
else if (ret_len > 1) {