diff options
| author | Johan Dahlin <johan@gnome.org> | 2008-08-22 08:18:23 (GMT) |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2008-08-22 08:18:23 (GMT) |
| commit | 40012e02d2bd35936234e1eded961a6ca7dc31ff (patch) | |
| tree | 8d8bf9a36b61ef6866785acc678eec158dfa3f92 | |
| parent | 67fedd07b7c065836c90cc1a6e95105bafe9c89b (diff) | |
Handle uint8, improve error messages Improve exception message Kill Use
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
svn path=/trunk/; revision=69
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | bank/bank-argument.c | 7 | ||||
| -rw-r--r-- | bank/btypes.py | 6 | ||||
| -rw-r--r-- | overrides/WebKit.py | 6 | ||||
| -rw-r--r-- | webkittest.py | 2 |
5 files changed, 23 insertions, 10 deletions
@@ -1,3 +1,15 @@ +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 + 2008-08-21 Johan Dahlin <johan@gnome.org> * bank/module.py: diff --git a/bank/bank-argument.c b/bank/bank-argument.c index 62744af..16cf297 100644 --- a/bank/bank-argument.c +++ b/bank/bank-argument.c @@ -38,6 +38,7 @@ pyg_argument_from_pyobject(PyObject *object, GIArgInfo *info) 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 @@ pyg_argument_from_pyobject(PyObject *object, GIArgInfo *info) 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 @@ pyg_argument_to_pyobject(GArgument *arg, GITypeInfo *type_info) 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; } diff --git a/bank/btypes.py b/bank/btypes.py index 8b2fed8..1941fde 100644 --- a/bank/btypes.py +++ b/bank/btypes.py @@ -128,7 +128,11 @@ class Method(Function): 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 diff --git a/overrides/WebKit.py b/overrides/WebKit.py deleted file mode 100644 index 4e40b07..0000000 --- a/overrides/WebKit.py +++ /dev/null @@ -1,6 +0,0 @@ -from bank.module import DynamicModule - -class WebKitModule(DynamicModule): - def created(self): - self.webkit_init() - diff --git a/webkittest.py b/webkittest.py index 375015d..8704cac 100644 --- a/webkittest.py +++ b/webkittest.py @@ -8,7 +8,7 @@ win = Gtk.Window(Gtk.WindowType.TOPLEVEL) sw = Gtk.ScrolledWindow(None, None) win.add(sw) -p = WebKit.Page() +p = WebKit.WebView() p.open("http://www.google.com/") sw.add(p) |