kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

App: fix pyObjectToAny() in Python3

Browse Source
This commit is contained in:
Zheng, Lei
2019-12-09 00:34:33 +00:00
parent 22e9133dd0
commit 13fd54a42f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/App/Expression.cpp
View File

@@ -495,19 +495,17 @@ App::any pyObjectToAny(Py::Object value, bool check) {
#if PY_MAJOR_VERSION < 3
else if (PyString_Check(pyvalue))
return App::any(std::string(PyString_AsString(pyvalue)));
#endif
else if (PyUnicode_Check(pyvalue)) {
PyObject * s = PyUnicode_AsUTF8String(pyvalue);
if(!s)
FC_THROWM(Base::ValueError,"Invalid unicode string");
Py::Object o(s,true);
#if PY_MAJOR_VERSION >= 3
return App::any(std::string(PyUnicode_AsUTF8(s)));
#else
return App::any(std::string(PyString_AsString(s)));
#endif
}
#else
else if (PyUnicode_Check(pyvalue))
return App::any(std::string(PyUnicode_AsUTF8(pyvalue)));
#endif
else {
return App::any(pyObjectWrap(pyvalue));
}