From c7bb5dff3a5259ce7e59db7932580173462b00a1 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Thu, 27 Jan 2011 23:12:34 +0100 Subject: decode.c: Simplify the import code. Use PyImport_ImportModule() instead of PyImport_Import(), so we don't have to temporarily create a py_name object. --- decode.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/decode.c b/decode.c index 76f6317..aa126df 100644 --- a/decode.c +++ b/decode.c @@ -158,22 +158,14 @@ int sigrokdecode_load_decoder(const char *name, struct sigrokdecode_decoder **dec) { struct sigrokdecode_decoder *d; - PyObject *py_name, *py_mod, *py_func, *py_res /* , *py_tuple */; + PyObject *py_mod, *py_func, *py_res /* , *py_tuple */; int r; - /* Get the name of the decoder module as Python string. */ - if (!(py_name = PyString_FromString(name))) { /* NEWREF */ - PyErr_Print(); /* Returns void. */ - return SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ - } - /* "Import" the Python module. */ - if (!(py_mod = PyImport_Import(py_name))) { /* NEWREF */ + if (!(py_mod = PyImport_ImportModule(name))) { /* NEWREF */ PyErr_Print(); /* Returns void. */ - Py_XDECREF(py_name); return SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */ } - Py_XDECREF(py_name); /* Get the 'register' function name as Python callable object. */ py_func = PyObject_GetAttrString(py_mod, "register"); /* NEWREF */ -- cgit v1.2.3-70-g09d2