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

py3: ported Import to python3

Browse Source
This commit is contained in:
wmayer 2016-01-23 17:22:22 +01:00 committed by looooo
parent 05544f395c
commit 944d62efc9
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/Import/App/AppImport.cpp
View File

@ -36,7 +36,7 @@ namespace Import {
extern PyObject* initModule();
}
PyMODINIT_FUNC initImport()
PyMOD_INIT_FUNC(Import)
{
PyObject* importModule = Import::initModule();
@ -45,7 +45,7 @@ PyMODINIT_FUNC initImport()
}
catch(const Base::Exception& e) {
PyErr_SetString(PyExc_ImportError, e.what());
return;
PyMOD_Return(0);
}
// add mesh elements
@ -55,4 +55,5 @@ PyMODINIT_FUNC initImport()
//Import::StepShape ::init();
Base::Console().Log("Loading Import module... done\n");
PyMOD_Return(importModule);
}

13
src/Mod/Import/Gui/AppImportGui.cpp
View File

@ -43,23 +43,26 @@ namespace ImportGui {
extern PyObject* initModule();
}
PyMODINIT_FUNC initImportGui()
PyMOD_INIT_FUNC(ImportGui)
{
if (!Gui::Application::Instance) {
PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application.");
return;
PyMOD_Return(0);
}
(void)ImportGui::initModule();
Base::Console().Log("Loading GUI of Import module... done\n");
try {
Base::Interpreter().loadModule("PartGui");
}
catch(const Base::Exception& e) {
PyErr_SetString(PyExc_ImportError, e.what());
return;
PyMOD_Return(0);
}
PyObject* mod = ImportGui::initModule();
Base::Console().Log("Loading GUI of Import module... done\n");
CreateImportCommands();
ImportGui::Workbench::init();
PyMOD_Return(mod);
}