diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-11-23 21:08:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-11-23 21:08:42 +0300 |
| commit | 052290d2b378d8639598b1ca75972a83c9fc41c0 (patch) | |
| tree | e6f3e1e2ccbe4bb8bad1d30285b33eefe7833059 /source/blender/python/intern/bpy_operator_wrap.c | |
| parent | 4c03ce91001ebb7f63c12e32902dd2cb7e487d1a (diff) | |
fixed some error reporting issues with calling operators
Diffstat (limited to 'source/blender/python/intern/bpy_operator_wrap.c')
| -rw-r--r-- | source/blender/python/intern/bpy_operator_wrap.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/source/blender/python/intern/bpy_operator_wrap.c b/source/blender/python/intern/bpy_operator_wrap.c index 3789c5b1258..0c0d043c4be 100644 --- a/source/blender/python/intern/bpy_operator_wrap.c +++ b/source/blender/python/intern/bpy_operator_wrap.c @@ -105,7 +105,11 @@ static int PYTHON_OT_generic(int mode, bContext *C, wmOperatorType *ot, wmOperat py_class_instance = PyObject_Call(py_class, args, NULL); Py_DECREF(args); - if (py_class_instance) { /* Initializing the class worked, now run its invoke function */ + if (py_class_instance==NULL) { /* Initializing the class worked, now run its invoke function */ + PyErr_Print(); + PyErr_Clear(); + } + else { RNA_pointer_create(NULL, &RNA_Context, C, &ptr_context); if (mode==PYOP_INVOKE) { @@ -137,10 +141,6 @@ static int PYTHON_OT_generic(int mode, bContext *C, wmOperatorType *ot, wmOperat Py_DECREF(args); Py_DECREF(item); } - else { - PyErr_Print(); - PyErr_Clear(); - } if (ret == NULL) { /* covers py_class_instance failing too */ if(op) @@ -149,9 +149,8 @@ static int PYTHON_OT_generic(int mode, bContext *C, wmOperatorType *ot, wmOperat else { if (mode==PYOP_POLL) { if (PyBool_Check(ret) == 0) { - PyErr_SetString(PyExc_ValueError, "Python poll function return value "); - if(op) - BPy_errors_to_report(op->reports); + PyErr_Format(PyExc_ValueError, "Python operator '%s.poll', did not return a bool value", ot->idname); + BPy_errors_to_report(op ? op->reports:NULL); /* prints and clears if NULL given */ } else { ret_flag= ret==Py_True ? 1:0; @@ -159,11 +158,8 @@ static int PYTHON_OT_generic(int mode, bContext *C, wmOperatorType *ot, wmOperat } else if (BPY_flag_from_seq(pyop_ret_flags, ret, &ret_flag) == -1) { /* the returned value could not be converted into a flag */ - if(op) { - fprintf(stderr, "error using return value from \"%s\"\n", op->idname); // for some reason the error raised doesnt include file:line... this helps - BPy_errors_to_report(op->reports); - } - + PyErr_Format(PyExc_ValueError, "Python operator, error using return value from \"%s\"\n", ot->idname); + BPy_errors_to_report(op ? op->reports:NULL); ret_flag = OPERATOR_CANCELLED; } /* there is no need to copy the py keyword dict modified by |