+ handle unicode strings in class PythonWrapper

FreeCAD · Nov 19, 2014 · b11acfd · b11acfd
1 parent 7a201f9
commit b11acfd
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/Gui/WidgetFactory.cpp b/src/Gui/WidgetFactory.cpp
@@ -134,6 +134,15 @@ PythonWrapper::PythonWrapper()
 
 bool PythonWrapper::toCString(const Py::Object& pyobject, std::string& str)
 {
+    if (PyUnicode_Check(pyobject.ptr())) {
+        PyObject* unicode = PyUnicode_AsUTF8String(pyobject.ptr());
+        str = PyString_AsString(unicode);
+        Py_DECREF(unicode);
+        return true;
+    }
+    else if (PyString_Check(pyobject.ptr())) {
+        str = PyString_AsString(pyobject.ptr());
+    }
 #if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
     if (Shiboken::String::check(pyobject.ptr())) {
         const char* s = Shiboken::String::toCString(pyobject.ptr());