diff options
author | Johan Dahlin <johan@src.gnome.org> | 2005-09-22 23:14:01 +0000 |
---|---|---|
committer | Johan Dahlin <johan@src.gnome.org> | 2005-09-22 23:14:01 +0000 |
commit | 8acb55740ab353ac461bcccd8094c592391a02ee (patch) | |
tree | 5e13569f1de2da34593eab21a8138648f62b2959 | |
parent | aa9ad01a98ff1a9e6211e5311606f1d4d124eba5 (diff) | |
download | pygobject-8acb55740ab353ac461bcccd8094c592391a02ee.tar.gz pygobject-8acb55740ab353ac461bcccd8094c592391a02ee.tar.xz pygobject-8acb55740ab353ac461bcccd8094c592391a02ee.zip |
Include the object and the name of the signal in TypeErrors
* gobject/gobjectmodule.c: (pyg_type_from_name):
* gobject/pygobject.c: (pygobject_connect),
(pygobject_connect_after), (pygobject_connect_object),
(pygobject_connect_object_after), (pygobject_emit),
(pygobject_stop_emission):
Include the object and the name of the signal in TypeErrors
-rw-r--r-- | gobject/gobjectmodule.c | 4 | ||||
-rw-r--r-- | gobject/pygobject.c | 24 |
2 files changed, 21 insertions, 7 deletions
diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index 0bcc98e..f07be35 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -274,7 +274,9 @@ pyg_type_from_name (PyObject *self, PyObject *args) type = g_type_from_name(name); if (type != 0) return pyg_type_wrapper_new(type); - PyErr_SetString(PyExc_RuntimeError, "unknown type name"); + PyErr_Format(PyExc_RuntimeError, "%s: unknown type name: %s", + PyString_AsString(PyObject_Repr((PyObject*)self)), + name); return NULL; } diff --git a/gobject/pygobject.c b/gobject/pygobject.c index 05551ec..c0cdca9 100644 --- a/gobject/pygobject.c +++ b/gobject/pygobject.c @@ -1147,7 +1147,9 @@ pygobject_connect(PyGObject *self, PyObject *args) } if (!g_signal_parse_name(name, G_OBJECT_TYPE(self->obj), &sigid, &detail, TRUE)) { - PyErr_SetString(PyExc_TypeError, "unknown signal name"); + PyErr_Format(PyExc_TypeError, "%s: unknown signal name: %s", + PyString_AsString(PyObject_Repr((PyObject*)self)), + name); return NULL; } extra_args = PySequence_GetSlice(args, 2, len); @@ -1189,7 +1191,9 @@ pygobject_connect_after(PyGObject *self, PyObject *args) } if (!g_signal_parse_name(name, G_OBJECT_TYPE(self->obj), &sigid, &detail, TRUE)) { - PyErr_SetString(PyExc_TypeError, "unknown signal name"); + PyErr_Format(PyExc_TypeError, "%s: unknown signal name: %s", + PyString_AsString(PyObject_Repr((PyObject*)self)), + name); return NULL; } extra_args = PySequence_GetSlice(args, 2, len); @@ -1231,7 +1235,9 @@ pygobject_connect_object(PyGObject *self, PyObject *args) } if (!g_signal_parse_name(name, G_OBJECT_TYPE(self->obj), &sigid, &detail, TRUE)) { - PyErr_SetString(PyExc_TypeError, "unknown signal name"); + PyErr_Format(PyExc_TypeError, "%s: unknown signal name: %s", + PyString_AsString(PyObject_Repr((PyObject*)self)), + name); return NULL; } extra_args = PySequence_GetSlice(args, 3, len); @@ -1273,7 +1279,9 @@ pygobject_connect_object_after(PyGObject *self, PyObject *args) } if (!g_signal_parse_name(name, G_OBJECT_TYPE(self->obj), &sigid, &detail, TRUE)) { - PyErr_SetString(PyExc_TypeError, "unknown signal name"); + PyErr_Format(PyExc_TypeError, "%s: unknown signal name: %s", + PyString_AsString(PyObject_Repr((PyObject*)self)), + name); return NULL; } extra_args = PySequence_GetSlice(args, 3, len); @@ -1357,7 +1365,9 @@ pygobject_emit(PyGObject *self, PyObject *args) Py_DECREF(first); if (!g_signal_parse_name(name, G_OBJECT_TYPE(self->obj), &signal_id, &detail, TRUE)) { - PyErr_SetString(PyExc_TypeError, "unknown signal name"); + PyErr_Format(PyExc_TypeError, "%s: unknown signal name: %s", + PyString_AsString(PyObject_Repr((PyObject*)self)), + name); return NULL; } g_signal_query(signal_id, &query); @@ -1427,7 +1437,9 @@ pygobject_stop_emission(PyGObject *self, PyObject *args) return NULL; if (!g_signal_parse_name(signal, G_OBJECT_TYPE(self->obj), &signal_id, &detail, TRUE)) { - PyErr_SetString(PyExc_TypeError, "unknown signal name"); + PyErr_Format(PyExc_TypeError, "%s: unknown signal name: %s", + PyString_AsString(PyObject_Repr((PyObject*)self)), + signal); return NULL; } g_signal_stop_emission(self->obj, signal_id, detail); |