pybank r69 - in trunk: . bank overrides

[johan svn gnome org]

Author: johan
Date: Fri Aug 22 08:18:23 2008
New Revision: 69
URL: http://svn.gnome.org/viewvc/pybank?rev=69&view=rev

Log:
2008-08-22  Johan Dahlin  <johan gnome org>

    * bank/bank-argument.c (pyg_argument_from_pyobject),
    (pyg_argument_to_pyobject):
    Handle uint8, improve error messages
    * bank/btypes.py:
    Improve exception message
    * overrides/WebKit.py:
    Kill
    * webkittest.py:
    Use WebKit.WebView instead of Page



Removed:
   trunk/overrides/WebKit.py
Modified:
   trunk/ChangeLog
   trunk/bank/bank-argument.c
   trunk/bank/btypes.py
   trunk/webkittest.py

Modified: trunk/bank/bank-argument.c
==============================================================================
--- trunk/bank/bank-argument.c	(original)
+++ trunk/bank/bank-argument.c	Fri Aug 22 08:18:23 2008
@@ -38,6 +38,7 @@
 	else
 	    arg.v_pointer = PyString_AsString(object);
 	break;
+    case GI_TYPE_TAG_INT8:
     case GI_TYPE_TAG_INT:
 	arg.v_int = PyInt_AsLong(object);
 	break;
@@ -48,7 +49,8 @@
 	    arg.v_pointer = PyCObject_AsVoidPtr(object);
 	break;
     default:
-	g_print("<PyO->GArg> GITypeTag %d is unhandled\n", type_tag);
+	g_print("<PyO->GArg> GITypeTag %s is unhandled\n",
+		g_type_tag_to_string(type_tag));
 	break;
     }
     g_base_info_unref((GIBaseInfo*)type_info);
@@ -86,7 +88,8 @@
 	obj = PyCObject_FromVoidPtr(arg->v_pointer, NULL);
 	break;
     default:
-	g_print("<GArg->PyO> GITypeTag %d is unhandled\n", type_tag);
+	g_print("<GArg->PyO> GITypeTag %s is unhandled\n",
+		g_type_tag_to_string(type_tag));
 	obj = PyString_FromString("<unhandled return value!>");	/*  */
 	break;
     }

Modified: trunk/bank/btypes.py
==============================================================================
--- trunk/bank/btypes.py	(original)
+++ trunk/bank/btypes.py	Fri Aug 22 08:18:23 2008
@@ -128,7 +128,11 @@
         retval = self.info.invoke(*inArgs)
 
         if self.info.isConstructor():
-            assert retval is not None
+            if retval is None:
+                raise AssertionError(
+                    "Invoked constructor %s.%s.%s returned NULL " % (
+                    self.__module__, self.className, self.info.getName()))
+
             if not self.static:
                 obj._object = retval
                 retval = None

Modified: trunk/webkittest.py
==============================================================================
--- trunk/webkittest.py	(original)
+++ trunk/webkittest.py	Fri Aug 22 08:18:23 2008
@@ -8,7 +8,7 @@
 sw = Gtk.ScrolledWindow(None, None)
 win.add(sw)
 
-p = WebKit.Page()
+p = WebKit.WebView()
 p.open("http://www.google.com/";)
 sw.add(p)