py3: python3-related fix in Spreadsheet

FreeCAD · Feb 18, 2017 · 3efc4fe · 3efc4fe
1 parent 3d3a8d0
commit 3efc4fe
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/Mod/Spreadsheet/App/SheetPyImp.cpp b/src/Mod/Spreadsheet/App/SheetPyImp.cpp
@@ -477,9 +477,18 @@ PyObject* SheetPy::setAlias(PyObject *args)
 
     try {
         address = stringToAddress(strAddress);
-
-        if (PyString_Check(value))
+        if (PyUnicode_Check(value))
+#if PY_MAJOR_VERSION >= 3
+            getSheetPtr()->setAlias(address, PyUnicode_AsUTF8(value));
+#else
+        {
+            PyObject* unicode = PyUnicode_AsUTF8String(value);
+            v = QString::fromUtf8(PyString_AsString(unicode));
+            Py_DECREF(unicode);            
+        }
+        else if (PyString_Check(value))
             getSheetPtr()->setAlias(address, PyString_AsString(value));
+#endif
         else if (value == Py_None)
             getSheetPtr()->setAlias(address, "");
         else