Warn if io callback returns None: almost always this is an error

2 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a329971..29a2886 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-14  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
+
+	* gobject/gobjectmodule.c (iowatch_marshal): Warn if io callback
+	returns None: almost always this is an error.
+
 2006-01-13  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
 
 	* gobject/pygobject.c (pygobject_register_class): Change strategy
diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c
index 6e00ceb..37d2e4c 100644
--- a/gobject/gobjectmodule.c
+++ b/gobject/gobjectmodule.c
@@ -1921,6 +1921,12 @@ iowatch_marshal(GIOChannel *source, GIOCondition condition, gpointer user_data)
 	PyErr_Print();
 	res = FALSE;
     } else {
+        if (ret == Py_None) {
+            if (PyErr_Warn(PyExc_Warning, "gobject.io_add_watch callback returned None;"
+                           " should return True/False")) {
+                PyErr_Print();
+            }
+        }
 	res = PyObject_IsTrue(ret);
 	Py_DECREF(ret);
     }