X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=util.c;h=c3b84ab6463fbc4435735ae4c9f10e584d057595;hp=fcadf47edcdfd5658b6ccdd5257e016524c74722;hb=e9a3c933ea8d77a46b881e525c2cfaf71b23041d;hpb=201a85a8ea071d37f4fda2668c0a1c488d852f4e

diff --git a/util.c b/util.c
index fcadf47..c3b84ab 100644
--- a/util.c
+++ b/util.c
@@ -21,6 +21,32 @@
 #include <config.h>
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 
+/**
+ * Import a Python module by name.
+ *
+ * This function is implemented in terms of PyImport_Import() rather than
+ * PyImport_ImportModule(), so that the import hooks are not bypassed.
+ *
+ * @param[in] name The name of the module to load as UTF-8 string.
+ * @return The Python module object, or NULL if an exception occurred. The
+ *  caller is responsible for evaluating and clearing the Python error state.
+ *
+ * @private
+ */
+SRD_PRIV PyObject *py_import_by_name(const char *name)
+{
+	PyObject *py_mod, *py_modname;
+
+	py_modname = PyUnicode_FromString(name);
+	if (!py_modname)
+		return NULL;
+
+	py_mod = PyImport_Import(py_modname);
+	Py_DECREF(py_modname);
+
+	return py_mod;
+}
+
 /**
  * Get the value of a Python object's attribute, returned as a newly
  * allocated char *.
@@ -189,3 +215,55 @@ err_out:
 
 	return SRD_ERR_PYTHON;
 }
+
+/**
+ * Convert a Python scalar object to a GLib variant.
+ * Supported variant types are string, int64 and double.
+ *
+ * @param[in] py_obj The Python object. Must not be NULL.
+ * @return A floating reference to a new variant, or NULL on failure.
+ *
+ * @private
+ */
+SRD_PRIV GVariant *py_obj_to_variant(PyObject *py_obj)
+{
+	GVariant *var = NULL;
+
+	if (PyUnicode_Check(py_obj)) { /* string */
+		PyObject *py_bytes;
+		const char *str;
+
+		py_bytes = PyUnicode_AsUTF8String(py_obj);
+		if (py_bytes) {
+			str = PyBytes_AsString(py_bytes);
+			if (str)
+				var = g_variant_new_string(str);
+			Py_DECREF(py_bytes);
+		}
+		if (!var)
+			srd_exception_catch("Failed to extract string value");
+
+	} else if (PyLong_Check(py_obj)) { /* integer */
+		int64_t val;
+
+		val = PyLong_AsLongLong(py_obj);
+		if (!PyErr_Occurred())
+			var = g_variant_new_int64(val);
+		else
+			srd_exception_catch("Failed to extract integer value");
+
+	} else if (PyFloat_Check(py_obj)) { /* float */
+		double val;
+
+		val = PyFloat_AsDouble(py_obj);
+		if (!PyErr_Occurred())
+			var = g_variant_new_double(val);
+		else
+			srd_exception_catch("Failed to extract float value");
+
+	} else {
+		srd_err("Failed to extract value of unsupported type.");
+	}
+
+	return var;
+}