diff options
| author | James Henstridge <james@daa.com.au> | 2003-07-24 15:06:07 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2003-07-24 15:06:07 +0000 |
| commit | 86ed4b32851b5fde01af74846f691f2cb07c6048 (patch) | |
| tree | 2e9010849e5da2af0ff10bac7e61037800dc7f8f | |
| parent | c84c9bc66043da5fe0826aa2f2b54875d8f30880 (diff) | |
| download | pygobject-86ed4b32851b5fde01af74846f691f2cb07c6048.tar.gz pygobject-86ed4b32851b5fde01af74846f691f2cb07c6048.tar.xz pygobject-86ed4b32851b5fde01af74846f691f2cb07c6048.zip | |
same here.
2003-07-24 James Henstridge <james@daa.com.au>
* gtk/pygtk.h (init_pygtk): same here.
* pygobject.h (init_pygobject): convert fatal errors to normal
exceptions.
* gtk/gtkglmodule.c (initgl): same here.
* gtk/libglademodule.c (initglade): same here.
* gtk/gtkmodule.c (init_gtk): same here.
* atkmodule.c (initatk): same here.
* pangomodule.c (initpango): same here.
* gobjectmodule.c (initgobject): don't cause fatal errors if an
exception on init.
* codegen/codegen.py (write_source): print an error message if it
isn't possible to import a particular name from the module.
* autogen.sh (DIE): require Automake 1.7.
* configure.in (AC_ARG_ENABLE): enable thread support by default.
| -rw-r--r-- | gobject/gobjectmodule.c | 5 | ||||
| -rw-r--r-- | gobject/pygobject.h | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index e5165bd..7421629 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -2075,9 +2075,4 @@ initgobject(void) PyModule_AddObject(m, "TYPE_PARAM", pyg_type_wrapper_new(G_TYPE_PARAM)); PyModule_AddObject(m, "TYPE_OBJECT", pyg_type_wrapper_new(G_TYPE_OBJECT)); PyModule_AddObject(m, "TYPE_PYOBJECT", pyg_type_wrapper_new(PY_TYPE_OBJECT)); - - if (PyErr_Occurred()) { - PyErr_Print(); - Py_FatalError("can't initialise module gobject"); - } } diff --git a/gobject/pygobject.h b/gobject/pygobject.h index 2c769d6..62c4cd2 100644 --- a/gobject/pygobject.h +++ b/gobject/pygobject.h @@ -151,11 +151,13 @@ struct _PyGObject_Functions *_PyGObject_API; if (PyCObject_Check(cobject)) \ _PyGObject_API = (struct _PyGObject_Functions *)PyCObject_AsVoidPtr(cobject); \ else { \ - Py_FatalError("could not find _PyGObject_API object"); \ + PyErr_SetString(PyExc_RuntimeError, \ + "could not find _PyGObject_API object"); \ return; \ } \ } else { \ - Py_FatalError("could not import gobject"); \ + PyErr_SetString(PyExc_ImportError, \ + "could not import gobject"); \ return; \ } \ } |