BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

python: fix conversion to string variants.

This commit is contained in:
Martin Ling 2014-09-14 04:53:06 +01:00
parent 13fef1ed24
commit f90ed2d1af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bindings/python/sigrok/core/classes.i
View File

@ -294,7 +294,7 @@ Glib::VariantBase python_to_variant_by_key(PyObject *input, const sigrok::Config
if (type == SR_T_UINT64 && PyLong_Check(input))
return Glib::Variant<guint64>::create(PyLong_AsLong(input));
else if (type == SR_T_STRING && PyString_Check(input))
return Glib::Variant<std::string>::create(PyString_AsString(input));
return Glib::Variant<Glib::ustring>::create(PyString_AsString(input));
else if (type == SR_T_BOOL && PyBool_Check(input))
return Glib::Variant<bool>::create(input == Py_True);
else if (type == SR_T_FLOAT && PyFloat_Check(input))
@ -316,7 +316,7 @@ Glib::VariantBase python_to_variant_by_option(PyObject *input,
if (type == G_VARIANT_TYPE_UINT64 && PyLong_Check(input))
return Glib::Variant<guint64>::create(PyLong_AsLong(input));
else if (type == G_VARIANT_TYPE_STRING && PyString_Check(input))
return Glib::Variant<std::string>::create(PyString_AsString(input));
return Glib::Variant<Glib::ustring>::create(PyString_AsString(input));
else if (type == G_VARIANT_TYPE_BOOLEAN && PyBool_Check(input))
return Glib::Variant<bool>::create(input == Py_True);
else if (type == G_VARIANT_TYPE_DOUBLE && PyFloat_Check(input))