From 738a697d94936b85ddbb1c9204fb6a85eb99557d Mon Sep 17 00:00:00 2001 From: luz paz Date: Wed, 21 Apr 2021 22:06:59 -0400 Subject: [PATCH] [TD] remove Py2 code from TD --- src/Mod/TechDraw/App/AppTechDrawPy.cpp | 19 ----------------- src/Mod/TechDraw/App/CenterLinePyImp.cpp | 21 ------------------- src/Mod/TechDraw/App/DrawPagePyImp.cpp | 8 ------- src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp | 8 ------- src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp | 4 ---- .../TechDraw/App/DrawViewCollectionPyImp.cpp | 8 ------- src/Mod/TechDraw/App/DrawViewPartPyImp.cpp | 7 ------- src/Mod/TechDraw/Gui/Command.cpp | 4 ---- src/Mod/TechDraw/Gui/QGITile.cpp | 4 ---- src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp | 4 ---- src/Mod/TechDraw/Gui/TaskActiveView.cpp | 4 ---- 11 files changed, 91 deletions(-) diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp index ed07a2a5fe..23e64468a1 100644 --- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp +++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp @@ -781,17 +781,10 @@ private: try { Py::Sequence list(pEdgeList); for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) { -#if PY_MAJOR_VERSION >= 3 if (PyUnicode_Check((*it).ptr())) { std::string temp = PyUnicode_AsUTF8((*it).ptr()); edgeList.push_back(temp); } -#else - if (PyString_Check((*it).ptr())) { - std::string temp = PyString_AsString((*it).ptr()); //py2 only!!! - edgeList.push_back(temp); - } -#endif } } catch (Standard_Failure& e) { @@ -829,15 +822,9 @@ private: else { throw Py::TypeError("expected (DrawViewPart, dimType, from, to"); } -#if PY_MAJOR_VERSION >= 3 if (PyUnicode_Check(pDimType) ) { dimType = PyUnicode_AsUTF8(pDimType); } -#else - if (PyString_Check(pDimType) ) { - dimType = PyString_AsString(pDimType); - } -#endif if (PyObject_TypeCheck(pFrom, &(Base::VectorPy::Type))) { from = static_cast(pFrom)->value(); @@ -877,15 +864,9 @@ private: else { throw Py::TypeError("expected (DrawViewPart, dimType, from, to"); } -#if PY_MAJOR_VERSION >= 3 if (PyUnicode_Check(pDimType)) { dimType = PyUnicode_AsUTF8(pDimType); } -#else - if (PyString_Check(pDimType)) { - dimType = PyString_AsString(pDimType); - } -#endif if (PyObject_TypeCheck(pFrom, &(Base::VectorPy::Type))) { from = static_cast(pFrom)->value(); } diff --git a/src/Mod/TechDraw/App/CenterLinePyImp.cpp b/src/Mod/TechDraw/App/CenterLinePyImp.cpp index 570aec4fa9..823e3f140f 100644 --- a/src/Mod/TechDraw/App/CenterLinePyImp.cpp +++ b/src/Mod/TechDraw/App/CenterLinePyImp.cpp @@ -321,17 +321,10 @@ void CenterLinePy::setEdges(Py::Object arg) int i = 0; for ( ; i < tSize; i++) { PyObject* item = PyList_GetItem(pList, (Py_ssize_t) i); -#if PY_MAJOR_VERSION >= 3 if (PyUnicode_Check(item)) { std::string s = PyUnicode_AsUTF8(item); //py3 only!!! temp.push_back(s); } -#else - if (PyString_Check(item)) { - std::string s = PyString_AsString(item); //py2 only!!! - temp.push_back(s); - } -#endif } cl->m_edges = temp; } else { @@ -367,17 +360,10 @@ void CenterLinePy::setFaces(Py::Object arg) int i = 0; for ( ; i < tSize; i++) { PyObject* item = PyList_GetItem(pList, (Py_ssize_t) i); -#if PY_MAJOR_VERSION >= 3 if (PyUnicode_Check(item)) { std::string s = PyUnicode_AsUTF8(item); //py3 only!!! temp.push_back(s); } -#else - if (PyString_Check(item)) { - std::string s = PyString_AsString(item); //py2 only!!! - temp.push_back(s); - } -#endif } cl->m_faces = temp; } else { @@ -414,17 +400,10 @@ void CenterLinePy::setPoints(Py::Object arg) int i = 0; for ( ; i < tSize; i++) { PyObject* item = PyList_GetItem(pList, (Py_ssize_t) i); -#if PY_MAJOR_VERSION >= 3 if (PyUnicode_Check(item)) { std::string s = PyUnicode_AsUTF8(item); //py3 only!!! temp.push_back(s); } -#else - if (PyString_Check(item)) { - std::string s = PyString_AsString(item); //py2 only!!! - temp.push_back(s); - } -#endif } cl->m_verts = temp; } else { diff --git a/src/Mod/TechDraw/App/DrawPagePyImp.cpp b/src/Mod/TechDraw/App/DrawPagePyImp.cpp index 42607a80d4..cb52fd3fd4 100644 --- a/src/Mod/TechDraw/App/DrawPagePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawPagePyImp.cpp @@ -44,11 +44,7 @@ PyObject* DrawPagePy::addView(PyObject* args) DrawView* view = pyView->getDrawViewPtr(); //get DrawView for pyView int rc = page->addView(view); -#if PY_MAJOR_VERSION < 3 - return PyInt_FromLong((long) rc); -#else return PyLong_FromLong((long) rc); -#endif } PyObject* DrawPagePy::removeView(PyObject* args) @@ -69,11 +65,7 @@ PyObject* DrawPagePy::removeView(PyObject* args) int rc = page->removeView(view); -#if PY_MAJOR_VERSION < 3 - return PyInt_FromLong((long) rc); -#else return PyLong_FromLong((long) rc); -#endif } PyObject* DrawPagePy::getAllViews(PyObject* args) diff --git a/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp b/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp index 663dfaefd3..b2b58f02bd 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp @@ -72,11 +72,7 @@ PyObject* DrawProjGroupPy::removeProjection(PyObject* args) DrawProjGroup* projGroup = getDrawProjGroupPtr(); int i = projGroup->removeProjection(projType); -#if PY_MAJOR_VERSION < 3 - return PyInt_FromLong((long) i); -#else return PyLong_FromLong((long) i); -#endif } PyObject* DrawProjGroupPy::purgeProjections(PyObject* /*args*/) @@ -84,11 +80,7 @@ PyObject* DrawProjGroupPy::purgeProjections(PyObject* /*args*/) DrawProjGroup* projGroup = getDrawProjGroupPtr(); int i = projGroup->purgeProjections(); -#if PY_MAJOR_VERSION < 3 - return PyInt_FromLong((long) i); -#else return PyLong_FromLong((long) i); -#endif } PyObject* DrawProjGroupPy::getItemByLabel(PyObject* args) diff --git a/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp index cca9db485a..5823e3af7e 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp @@ -71,11 +71,7 @@ PyObject* DrawSVGTemplatePy::getEditFieldContent(PyObject* args) } std::string content = getDrawSVGTemplatePtr()->EditableTexts[fieldName]; if (!content.empty()) { -#if PY_MAJOR_VERSION < 3 - result = PyString_FromString(content.c_str()); -#else result = PyUnicode_FromString(content.c_str()); -#endif } return result; } diff --git a/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp b/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp index cb696f7983..1827abfb56 100644 --- a/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp @@ -50,11 +50,7 @@ PyObject* DrawViewCollectionPy::addView(PyObject* args) int i = collect->addView(view); -#if PY_MAJOR_VERSION < 3 - return PyInt_FromLong((long) i); -#else return PyLong_FromLong((long) i); -#endif } PyObject* DrawViewCollectionPy::removeView(PyObject* args) @@ -72,11 +68,7 @@ PyObject* DrawViewCollectionPy::removeView(PyObject* args) int i = collect->removeView(view); -#if PY_MAJOR_VERSION < 3 - return PyInt_FromLong((long) i); -#else return PyLong_FromLong((long) i); -#endif } diff --git a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp index 1a39f3beb6..610c185290 100644 --- a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp @@ -553,17 +553,10 @@ PyObject* DrawViewPartPy::makeCenterLine(PyObject *args) int i = 0; for ( ; i < size; i++) { PyObject* po = PyList_GetItem(pSubs, i); -#if PY_MAJOR_VERSION >= 3 if (PyUnicode_Check(po)) { std::string s = PyUnicode_AsUTF8(po); //py3 only!!! subs.push_back(s); } -#else - if (PyString_Check(po)) { - std::string s = PyString_AsString(po); //py2 only!!! - subs.push_back(s); - } -#endif } } CenterLine* cl = nullptr; diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index fa73b7f491..31a94facfd 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -1082,11 +1082,7 @@ void CmdTechDrawSymbol::activated(int iMsg) std::string FeatName = getUniqueObjectName("Symbol"); filename = Base::Tools::escapeEncodeFilename(filename); openCommand(QT_TRANSLATE_NOOP("Command", "Create Symbol")); -#if PY_MAJOR_VERSION < 3 - doCommand(Doc,"f = open(unicode(\"%s\",'utf-8'),'r')",(const char*)filename.toUtf8()); -#else doCommand(Doc,"f = open(\"%s\",'r')",(const char*)filename.toUtf8()); -#endif doCommand(Doc,"svg = f.read()"); doCommand(Doc,"f.close()"); doCommand(Doc,"App.activeDocument().addObject('TechDraw::DrawViewSymbol','%s')",FeatName.c_str()); diff --git a/src/Mod/TechDraw/Gui/QGITile.cpp b/src/Mod/TechDraw/Gui/QGITile.cpp index 7ef9c76488..717d71ee96 100644 --- a/src/Mod/TechDraw/Gui/QGITile.cpp +++ b/src/Mod/TechDraw/Gui/QGITile.cpp @@ -86,11 +86,7 @@ QGITile::QGITile(TechDraw::DrawTileWeld* dtw) : m_fontName = prefTextFont(); m_font = QFont(m_fontName); -#if PY_MAJOR_VERSION < 3 - setHandlesChildEvents(true); //qt4 deprecated in qt5 -#else setFiltersChildEvents(true); //qt5 -#endif setAcceptHoverEvents(true); setFlag(QGraphicsItem::ItemIsSelectable, false); setFlag(QGraphicsItem::ItemIsMovable, false); diff --git a/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp b/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp index 5f4d7a269b..9c58e78065 100644 --- a/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp +++ b/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp @@ -86,11 +86,7 @@ QGIWeldSymbol::QGIWeldSymbol(QGILeaderLine* myParent) : m_qgLead(myParent), m_blockDraw(false) { -#if PY_MAJOR_VERSION < 3 - setHandlesChildEvents(true); //qt4 deprecated in qt5 -#else setFiltersChildEvents(true); //qt5 -#endif setFlag(QGraphicsItem::ItemIsMovable, false); setCacheMode(QGraphicsItem::NoCache); diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.cpp b/src/Mod/TechDraw/Gui/TaskActiveView.cpp index d96c780e1e..3bbf8c8fc1 100644 --- a/src/Mod/TechDraw/Gui/TaskActiveView.cpp +++ b/src/Mod/TechDraw/Gui/TaskActiveView.cpp @@ -151,11 +151,7 @@ TechDraw::DrawViewSymbol* TaskActiveView::createActiveView(void) ui->qsbWeight->rawValue(), ui->qsbBorder->rawValue(), ui->cbMode->currentIndex()); -#if PY_MAJOR_VERSION < 3 - Command::doCommand(Command::Doc,"f = open(unicode(\"%s\",'utf-8'),'r')",(const char*)fileSpec.c_str()); -#else Command::doCommand(Command::Doc,"f = open(\"%s\",'r')",(const char*)fileSpec.c_str()); -#endif Command::doCommand(Command::Doc,"svg = f.read()"); // Command::doCommand(Command::Doc,"print('length of svg: {}'.format(len(svg)))");