%module(docstring=DOCSTRING) classes
%{
+#include <stdio.h>
#include <pygobject.h>
#include <numpy/arrayobject.h>
+PyObject *PyGObject_lib;
PyObject *GLib;
PyTypeObject *IOChannel;
PyTypeObject *PollFD;
%}
%init %{
- pygobject_init(-1, -1, -1);
+ PyGObject_lib = pygobject_init(-1, -1, -1);
+ if (!PyGObject_lib)
+ fprintf(stderr, "pygobject initialization failed.\n");
GLib = PyImport_ImportModule("gi.repository.GLib");
+ /*
+ * This check can't save us if the import fails, but at least it gives us
+ * a starting point to trace the issue versus straight out crashing.
+ */
+ if (!GLib) {
+ fprintf(stderr, "Import of gi.repository.GLib failed.\n");
+#if PY_VERSION_HEX >= 0x03000000
+ return NULL;
+#else
+ return;
+#endif
+ }
IOChannel = (PyTypeObject *) PyObject_GetAttrString(GLib, "IOChannel");
PollFD = (PyTypeObject *) PyObject_GetAttrString(GLib, "PollFD");
import_array();
if (!PyCallable_Check($input))
SWIG_exception(SWIG_TypeError, "Expected a callable Python object");
- $1 = [=] (const sigrok::LogLevel *loglevel, string message) {
+ $1 = [=] (const sigrok::LogLevel *loglevel, std::string message) {
auto gstate = PyGILState_Ensure();
auto log_obj = SWIG_NewPointerObj(
%{
-#include "libsigrok/libsigrokcxx.hpp"
+#include "libsigrokcxx/libsigrokcxx.hpp"
/* Convert from a Python dict to a std::map<std::string, std::string> */
std::map<std::string, std::string> dict_to_map_string(PyObject *dict)