From 04e0620d8ae62b852df3cc0ceebbf70856b369f3 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 23 Jan 2016 18:00:36 +0100 Subject: [PATCH] py3: ported Inspection to python3 --- src/Mod/Inspection/App/AppInspection.cpp | 8 +++++--- src/Mod/Inspection/Gui/AppInspectionGui.cpp | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Mod/Inspection/App/AppInspection.cpp b/src/Mod/Inspection/App/AppInspection.cpp index 4bb9112ca1..18b17bc657 100644 --- a/src/Mod/Inspection/App/AppInspection.cpp +++ b/src/Mod/Inspection/App/AppInspection.cpp @@ -30,6 +30,7 @@ #include #include +#include #include "InspectionFeature.h" @@ -56,15 +57,16 @@ PyObject* initModule() /* Python entry */ -PyMODINIT_FUNC initInspection() { - +PyMOD_INIT_FUNC(Inspection) +{ // ADD YOUR CODE HERE // // - (void)Inspection::initModule(); + PyObject* mod = Inspection::initModule(); Base::Console().Log("Loading Inspection module... done\n"); Inspection::PropertyDistanceList ::init(); Inspection::Feature ::init(); Inspection::Group ::init(); + PyMOD_Return(mod); } diff --git a/src/Mod/Inspection/Gui/AppInspectionGui.cpp b/src/Mod/Inspection/Gui/AppInspectionGui.cpp index e403b7c969..8c7ff77759 100644 --- a/src/Mod/Inspection/Gui/AppInspectionGui.cpp +++ b/src/Mod/Inspection/Gui/AppInspectionGui.cpp @@ -62,11 +62,11 @@ PyObject* initModule() /* Python entry */ -PyMODINIT_FUNC initInspectionGui() +PyMOD_INIT_FUNC(InspectionGui) { if (!Gui::Application::Instance) { PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application."); - return; + PyMOD_Return(0); } // instanciating the commands @@ -79,6 +79,7 @@ PyMODINIT_FUNC initInspectionGui() // // - (void)InspectionGui::initModule(); + PyObject* mod = InspectionGui::initModule(); Base::Console().Log("Loading GUI of Inspection module... done\n"); + PyMOD_Return(mod); }