diff options
| author | Alex Tereschenko <alext.mkrs@gmail.com> | 2015-10-29 21:09:27 +0100 |
|---|---|---|
| committer | Brendan Le Foll <brendan.le.foll@intel.com> | 2015-10-30 12:03:53 +0000 |
| commit | cd4626852d55e5f6067f01a0e1c11b86fdd8e4f4 (patch) | |
| tree | ad0480afb45479af0dbda408fe114687e3db2637 | |
| parent | 8e63c718e4a0556a75f6b7017c36e68457bf8b7d (diff) | |
gpio.c: enhanced Python-specific code
This further enhances fix introduced by commit 0836067
by adding Python 3 support and correcting Python version
hex string used in compiler directives.
Signed-off-by: Alex Tereschenko <alext.mkrs@gmail.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
| -rw-r--r-- | src/gpio/gpio.c | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/src/gpio/gpio.c b/src/gpio/gpio.c index 069e6b8..13db5c1 100644 --- a/src/gpio/gpio.c +++ b/src/gpio/gpio.c @@ -246,20 +246,47 @@ mraa_gpio_interrupt_handler(void* arg) } else { ret = PyEval_CallObject((PyObject*) dev->isr, arglist); if (ret == NULL) { -// code is python2 only -#if PY_VERSION_HEX < 0x0300000 syslog(LOG_ERR, "gpio: PyEval_CallObject failed"); PyObject *pvalue, *ptype, *ptraceback; + PyObject *pvalue_pystr, *ptype_pystr, *ptraceback_pystr; + char *pvalue_cstr, *ptype_cstr, *ptraceback_cstr; PyErr_Fetch(&pvalue, &ptype, &ptraceback); + pvalue_pystr = PyObject_Str(pvalue); + ptype_pystr = PyObject_Str(ptype); + ptraceback_pystr = PyObject_Str(ptraceback); +// Python2 +#if PY_VERSION_HEX < 0x03000000 + pvalue_cstr = PyString_AsString(pvalue_pystr); + ptype_cstr = PyString_AsString(ptype_pystr); + ptraceback_cstr = PyString_AsString(ptraceback_pystr); +// Python 3 and up +#elif PY_VERSION_HEX >= 0x03000000 + // In Python 3 we need one extra conversion + PyObject *pvalue_ustr, *ptype_ustr, *ptraceback_ustr; + pvalue_ustr = PyUnicode_AsUTF8String(pvalue_pystr); + pvalue_cstr = PyBytes_AsString(pvalue_ustr); + ptype_ustr = PyUnicode_AsUTF8String(ptype_pystr); + ptype_cstr = PyBytes_AsString(ptype_ustr); + ptraceback_ustr = PyUnicode_AsUTF8String(ptraceback_pystr); + ptraceback_cstr = PyBytes_AsString(ptraceback_ustr); +#endif // PY_VERSION_HEX syslog(LOG_ERR, "gpio: the error was %s:%s:%s", - PyString_AsString(PyObject_Str(pvalue)), - PyString_AsString(PyObject_Str(ptype)), - PyString_AsString(PyObject_Str(ptraceback)) + pvalue_cstr, + ptype_cstr, + ptraceback_cstr ); Py_XDECREF(pvalue); Py_XDECREF(ptype); Py_XDECREF(ptraceback); -#endif + Py_XDECREF(pvalue_pystr); + Py_XDECREF(ptype_pystr); + Py_XDECREF(ptraceback_pystr); +// Python 3 and up +#if PY_VERSION_HEX >= 0x03000000 + Py_XDECREF(pvalue_ustr); + Py_XDECREF(ptype_ustr); + Py_XDECREF(ptraceback_ustr); +#endif // PY_VERSION_HEX } else { Py_DECREF(ret); } |