suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

py3: ported Drawing to python3

Browse Source
This commit is contained in:
wmayer 2016-01-23 21:17:33 +01:00
parent 744724af51
commit a101d426a4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mod/Drawing/App/AppDrawing.cpp
View File

@ -15,6 +15,7 @@
#endif
#include <Base/Console.h>
#include <Base/PyObjectBase.h>
#include <Base/Interpreter.h>
#include "FeaturePage.h"
@ -33,7 +34,7 @@ extern PyObject* initModule();
}
/* Python entry */
PyMODINIT_FUNC initDrawing()
PyMOD_INIT_FUNC(Drawing)
{
// load dependent module
try {
@ -42,9 +43,9 @@ PyMODINIT_FUNC initDrawing()
}
catch(const Base::Exception& e) {
PyErr_SetString(PyExc_ImportError, e.what());
return;
PyMOD_Return(0);
}
(void)Drawing::initModule();
PyObject* mod = Drawing::initModule();
Base::Console().Log("Loading Drawing module... done\n");
@ -63,4 +64,6 @@ PyMODINIT_FUNC initDrawing()
Drawing::FeatureViewSymbol ::init();
Drawing::FeatureClip ::init();
Drawing::FeatureViewSpreadsheet ::init();
PyMOD_Return(mod);
}

7
src/Mod/Drawing/Gui/AppDrawingGui.cpp
View File

@ -49,14 +49,14 @@ extern PyObject* initModule();
/* Python entry */
PyMODINIT_FUNC initDrawingGui()
PyMOD_INIT_FUNC(DrawingGui)
{
if (!Gui::Application::Instance) {
PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application.");
return;
PyMOD_Return(0);
}
(void) DrawingGui::initModule();
PyObject* mod = DrawingGui::initModule();
Base::Console().Log("Loading GUI of Drawing module... done\n");
// instantiating the commands
@ -70,4 +70,5 @@ PyMODINIT_FUNC initDrawingGui()
// add resources and reloads the translators
loadDrawingResource();
PyMOD_Return(mod);
}