Imported Upstream version 3.19.91

[platform/upstream/python-gobject.git] / gi / pygtype.c

diff --git a/gi/pygtype.c b/gi/pygtype.c
index 985e969..a3784c8 100644 (file)
--- a/gi/pygtype.c
+++ b/gi/pygtype.c
@@ -704,7 +704,16 @@ pyg_closure_marshal(GClosure *closure,
 
            /* error condition */
            if (!item) {
-               goto out;
+            if (!PyErr_Occurred ())
+                PyErr_SetString (PyExc_TypeError,
+                                 "can't convert parameter to desired type");
+
+            if (pc->exception_handler)
+                pc->exception_handler (return_value, n_param_values, param_values);
+            else
+                PyErr_Print();
+
+            goto out;
            }
            PyTuple_SetItem(params, i, item);
        }