Document.openTransaction() now accepts unicode

FreeCAD · Mar 22, 2016 · 9e75213 · 9e75213
1 parent ff08391
commit 9e75213
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/App/DocumentPyImp.cpp b/src/App/DocumentPyImp.cpp
@@ -319,10 +319,18 @@ PyObject*  DocumentPy::moveObject(PyObject *args)
 
 PyObject*  DocumentPy::openTransaction(PyObject *args)
 {
+    PyObject *value;
+    if (!PyArg_ParseTuple(args, "|O",&value))
+        return NULL;    // NULL triggers exception
     char *pstr=0;
-    if (!PyArg_ParseTuple(args, "|s", &pstr))     // convert args: Python->C 
-        return NULL;                             // NULL triggers exception 
-
+    if (PyUnicode_Check(value)) {
+        PyObject* unicode = PyUnicode_AsLatin1String(value);
+        pstr = PyString_AsString(unicode);
+        Py_DECREF(unicode);
+    }
+    else if (PyString_Check(value)) {
+        pstr = PyString_AsString(value);
+    }
     getDocumentPtr()->openTransaction(pstr); 
     Py_Return; 
 }