From 2673f9ed59e001f64db88dc6915f2c6634d4967d Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 24 Jan 2016 02:33:54 +0100 Subject: [PATCH] py3: ported MeshPart to python3 --- src/Mod/MeshPart/App/AppMeshPart.cpp | 8 +++++--- src/Mod/MeshPart/App/AppMeshPartPy.cpp | 2 +- src/Mod/MeshPart/Gui/AppMeshPartGui.cpp | 8 +++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Mod/MeshPart/App/AppMeshPart.cpp b/src/Mod/MeshPart/App/AppMeshPart.cpp index c3ae9c3ff..fbd6d1da9 100644 --- a/src/Mod/MeshPart/App/AppMeshPart.cpp +++ b/src/Mod/MeshPart/App/AppMeshPart.cpp @@ -27,6 +27,7 @@ #endif #include +#include #include @@ -35,7 +36,7 @@ extern PyObject* initModule(); } /* Python entry */ -PyMODINIT_FUNC initMeshPart() +PyMOD_INIT_FUNC(MeshPart) { // load dependent module try { @@ -44,8 +45,9 @@ PyMODINIT_FUNC initMeshPart() } catch(const Base::Exception& e) { PyErr_SetString(PyExc_ImportError, e.what()); - return; + PyMOD_Return(0); } - (void)MeshPart::initModule(); + PyObject* mod = MeshPart::initModule(); Base::Console().Log("Loading MeshPart module... done\n"); + PyMOD_Return(mod); } diff --git a/src/Mod/MeshPart/App/AppMeshPartPy.cpp b/src/Mod/MeshPart/App/AppMeshPartPy.cpp index a25ab1793..ad19e9ba5 100644 --- a/src/Mod/MeshPart/App/AppMeshPartPy.cpp +++ b/src/Mod/MeshPart/App/AppMeshPartPy.cpp @@ -150,7 +150,7 @@ private: std::vector segm; segm.reserve(list.size()); for (unsigned int i=0; i > bounds; diff --git a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp index 5af3c42ab..b75ffa166 100644 --- a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp +++ b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp @@ -67,14 +67,14 @@ PyObject* initModule() /* Python entry */ -PyMODINIT_FUNC initMeshPartGui() +PyMOD_INIT_FUNC(MeshPartGui) { if (!Gui::Application::Instance) { PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application."); - return; + PyMOD_Return(0); } - (void)MeshPartGui::initModule(); + PyObject* mod = MeshPartGui::initModule(); Base::Console().Log("Loading GUI of MeshPart module... done\n"); // instantiating the commands @@ -83,4 +83,6 @@ PyMODINIT_FUNC initMeshPartGui() // add resources and reloads the translators loadMeshPartResource(); + + PyMOD_Return(mod); }