py3: ported Import to python3

FreeCAD · Feb 12, 2017 · 944d62e · 944d62e
1 parent 05544f3
commit 944d62e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/Mod/Import/App/AppImport.cpp b/src/Mod/Import/App/AppImport.cpp
@@ -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);
 }
diff --git a/src/Mod/Import/Gui/AppImportGui.cpp b/src/Mod/Import/Gui/AppImportGui.cpp
@@ -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);
 }