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

py3: Gui: files A-P ported to python3

Browse Source
This commit is contained in:
Yorik van Havre
2017-05-05 19:33:03 +02:00
committed by wmayer
parent 226dd17e5f
commit aa3f9288d6
10 changed files with 274 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
src/Gui/PythonWorkbenchPyImp.cpp
View File

@@ -62,15 +62,37 @@ PyObject* PythonWorkbenchPy::appendMenu(PyObject *args)
int nDepth = PyList_Size(pPath);
for (int j=0; j<nDepth;++j) {
PyObject* item = PyList_GetItem(pPath, j);
if (!PyString_Check(item))
if (PyUnicode_Check(item)) {
#if PY_MAJOR_VERSION >= 3
char* pItem = PyUnicode_AsUTF8(item);
path.push_back(pItem);
#else
PyObject* unicode = PyUnicode_AsEncodedString(item, "utf-8", 0);
char* pItem = PyString_AsString(unicode);
Py_DECREF(unicode);
path.push_back(pItem);
} else if (PyString_Check(item)) {
char* pItem = PyString_AsString(item);
path.push_back(pItem);
#endif
} else {
continue;
char* pItem = PyString_AsString(item);
path.push_back(pItem);
}
}
} else if (PyUnicode_Check(pPath)) {
#if PY_MAJOR_VERSION >= 3
char* pItem = PyUnicode_AsUTF8(pPath);
path.push_back(pItem);
#else
PyObject* unicode = PyUnicode_AsEncodedString(pPath, "utf-8", 0);
char* pItem = PyString_AsString(unicode);
Py_DECREF(unicode);
path.push_back(pItem);
} else if (PyString_Check(pPath)) {
// one single item
char* pItem = PyString_AsString(pPath);
path.push_back(pItem);
#endif
} else {
PyErr_SetString(PyExc_AssertionError, "Expected either a string or a stringlist as first argument");
return NULL; // NULL triggers exception
@@ -82,15 +104,37 @@ PyObject* PythonWorkbenchPy::appendMenu(PyObject *args)
int nItems = PyList_Size(pItems);
for (int i=0; i<nItems;++i) {
PyObject* item = PyList_GetItem(pItems, i);
if (!PyString_Check(item))
if (PyUnicode_Check(item)) {
#if PY_MAJOR_VERSION >= 3
char* pItem = PyUnicode_AsUTF8(item);
items.push_back(pItem);
#else
PyObject* unicode = PyUnicode_AsEncodedString(item, "utf-8", 0);
char* pItem = PyString_AsString(unicode);
Py_DECREF(unicode);
items.push_back(pItem);
} else if (PyString_Check(item)) {
char* pItem = PyString_AsString(item);
items.push_back(pItem);
#endif
} else {
continue;
char* pItem = PyString_AsString(item);
items.push_back(pItem);
}
}
} else if (PyUnicode_Check(pItems)) {
#if PY_MAJOR_VERSION >= 3
char* pItem = PyUnicode_AsUTF8(pItems);
items.push_back(pItem);
#else
PyObject* unicode = PyUnicode_AsEncodedString(pItems, "utf-8", 0);
char* pItem = PyString_AsString(unicode);
Py_DECREF(unicode);
items.push_back(pItem);
} else if (PyString_Check(pItems)) {
// one single item
char* pItem = PyString_AsString(pItems);
items.push_back(pItem);
#endif
} else {
PyErr_SetString(PyExc_AssertionError, "Expected either a string or a stringlist as first argument");
return NULL; // NULL triggers exception
@@ -127,7 +171,11 @@ PyObject* PythonWorkbenchPy::listMenus(PyObject *args)
PyObject* pyList = PyList_New(menus.size());
int i=0;
for (std::list<std::string>::iterator it = menus.begin(); it != menus.end(); ++it, ++i ) {
#if PY_MAJOR_VERSION >= 3
PyObject* str = PyUnicode_FromString(it->c_str());
#else
PyObject* str = PyString_FromString(it->c_str());
#endif
PyList_SetItem(pyList, i, str);
}
return pyList;
@@ -149,15 +197,37 @@ PyObject* PythonWorkbenchPy::appendContextMenu(PyObject *args)
int nDepth = PyList_Size(pPath);
for (int j=0; j<nDepth;++j) {
PyObject* item = PyList_GetItem(pPath, j);
if (!PyString_Check(item))
if (PyUnicode_Check(item)) {
#if PY_MAJOR_VERSION >= 3
char* pItem = PyUnicode_AsUTF8(item);
path.push_back(pItem);
#else
PyObject* unicode = PyUnicode_AsEncodedString(item, "utf-8", 0);
char* pItem = PyString_AsString(unicode);
Py_DECREF(unicode);
path.push_back(pItem);
} else if (PyString_Check(item)) {
char* pItem = PyString_AsString(item);
path.push_back(pItem);
#endif
} else {
continue;
char* pItem = PyString_AsString(item);
path.push_back(pItem);
}
}
} else if (PyUnicode_Check(pPath)) {
#if PY_MAJOR_VERSION >= 3
char* pItem = PyUnicode_AsUTF8(pPath);
path.push_back(pItem);
#else
PyObject* unicode = PyUnicode_AsEncodedString(pPath, "utf-8", 0);
char* pItem = PyString_AsString(unicode);
Py_DECREF(unicode);
path.push_back(pItem);
} else if (PyString_Check(pPath)) {
// one single item
char* pItem = PyString_AsString(pPath);
path.push_back(pItem);
#endif
} else {
PyErr_SetString(PyExc_AssertionError, "Expected either a string or a stringlist as first argument");
return NULL; // NULL triggers exception
@@ -169,15 +239,37 @@ PyObject* PythonWorkbenchPy::appendContextMenu(PyObject *args)
int nItems = PyList_Size(pItems);
for (int i=0; i<nItems;++i) {
PyObject* item = PyList_GetItem(pItems, i);
if (!PyString_Check(item))
if (PyUnicode_Check(item)) {
#if PY_MAJOR_VERSION >= 3
char* pItem = PyUnicode_AsUTF8(item);
items.push_back(pItem);
#else
PyObject* unicode = PyUnicode_AsEncodedString(item, "utf-8", 0);
char* pItem = PyString_AsString(unicode);
Py_DECREF(unicode);
items.push_back(pItem);
} else if (PyString_Check(item)) {
char* pItem = PyString_AsString(item);
items.push_back(pItem);
#endif
} else {
continue;
char* pItem = PyString_AsString(item);
items.push_back(pItem);
}
}
} else if (PyUnicode_Check(pItems)) {
#if PY_MAJOR_VERSION >= 3
char* pItem = PyUnicode_AsUTF8(pItems);
items.push_back(pItem);
#else
PyObject* unicode = PyUnicode_AsEncodedString(pItems, "utf-8", 0);
char* pItem = PyString_AsString(unicode);
Py_DECREF(unicode);
items.push_back(pItem);
} else if (PyString_Check(pItems)) {
// one single item
char* pItem = PyString_AsString(pItems);
items.push_back(pItem);
#endif
} else {
PyErr_SetString(PyExc_AssertionError, "Expected either a string or a stringlist as first argument");
return NULL; // NULL triggers exception
@@ -219,12 +311,23 @@ PyObject* PythonWorkbenchPy::appendToolbar(PyObject *args)
int nSize = PyList_Size(pObject);
for (int i=0; i<nSize;++i) {
PyObject* item = PyList_GetItem(pObject, i);
if (!PyString_Check(item))
if (PyUnicode_Check(item)) {
#if PY_MAJOR_VERSION >= 3
char* pItem = PyUnicode_AsUTF8(item);
items.push_back(pItem);
#else
PyObject* unicode = PyUnicode_AsEncodedString(item, "utf-8", 0);
char* pItem = PyString_AsString(unicode);
Py_DECREF(unicode);
items.push_back(pItem);
} else if (PyString_Check(item)) {
char* pItem = PyString_AsString(item);
items.push_back(pItem);
#endif
} else {
continue;
char* pItem = PyString_AsString(item);
items.push_back(pItem);
}
}
getPythonBaseWorkbenchPtr()->appendToolbar( psToolBar, items );
Py_Return;
@@ -256,7 +359,11 @@ PyObject* PythonWorkbenchPy::listToolbars(PyObject *args)
PyObject* pyList = PyList_New(bars.size());
int i=0;
for (std::list<std::string>::iterator it = bars.begin(); it != bars.end(); ++it, ++i ) {
#if PY_MAJOR_VERSION >= 3
PyObject* str = PyUnicode_FromString(it->c_str());
#else
PyObject* str = PyString_FromString(it->c_str());
#endif
PyList_SetItem(pyList, i, str);
}
return pyList;
@@ -280,10 +387,22 @@ PyObject* PythonWorkbenchPy::appendCommandbar(PyObject *args)
int nSize = PyList_Size(pObject);
for (int i=0; i<nSize;++i) {
PyObject* item = PyList_GetItem(pObject, i);
if (!PyString_Check(item))
if (PyUnicode_Check(item)) {
#if PY_MAJOR_VERSION >= 3
char* pItem = PyUnicode_AsUTF8(item);
items.push_back(pItem);
#else
PyObject* unicode = PyUnicode_AsEncodedString(item, "utf-8", 0);
char* pItem = PyString_AsString(unicode);
Py_DECREF(unicode);
items.push_back(pItem);
} else if (PyString_Check(item)) {
char* pItem = PyString_AsString(item);
items.push_back(pItem);
#endif
} else {
continue;
char* pItem = PyString_AsString(item);
items.push_back(pItem);
}
}
getPythonBaseWorkbenchPtr()->appendCommandbar( psToolBar, items );
@@ -317,7 +436,11 @@ PyObject* PythonWorkbenchPy::listCommandbars(PyObject *args)
PyObject* pyList = PyList_New(bars.size());
int i=0;
for (std::list<std::string>::iterator it = bars.begin(); it != bars.end(); ++it, ++i) {
#if PY_MAJOR_VERSION >= 3
PyObject* str = PyUnicode_FromString(it->c_str());
#else
PyObject* str = PyString_FromString(it->c_str());
#endif
PyList_SetItem(pyList, i, str);
}
return pyList;