+ simplify porting of Complete module to Python3

src/Mod/Complete/App/AppComplete.cpp

@@ -26,20 +26,38 @@
 # include <Python.h>
 #endif
 
+#include <CXX/Extensions.hxx>
+#include <CXX/Objects.hxx>
+
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 
 #include "CompleteConfiguration.h"
 
-extern struct PyMethodDef Complete_methods[];
+namespace Complete {
+class Module : public Py::ExtensionModule<Module>
+{
+public:
+    Module() : Py::ExtensionModule<Module>("Complete")
+    {
+        initialize("This module is the Complete module."); // register with Python
+    }
 
-PyDoc_STRVAR(module_Complete_doc,
-"This module is the Complete module.");
+    virtual ~Module() {}
+
+private:
+};
+
+PyObject* initModule()
+{
+    return (new Module)->module().ptr();
+}
+
+} // namespace Complete
 
 
 /* Python entry */
-extern "C" {
-void AppCompleteExport initComplete()
+PyMODINIT_FUNC initComplete()
 {
     // load dependent module
     try {
@@ -70,8 +88,6 @@ void AppCompleteExport initComplete()
         PyErr_SetString(PyExc_ImportError, e.what());
         return;
     }
-    Py_InitModule3("Complete", Complete_methods, module_Complete_doc);   /* mod name, table ptr */
+    (void)Complete::initModule();
     Base::Console().Log("Loading Complete module... done\n");
 }
-
-} // extern "C"

src/Mod/Complete/App/AppCompletePy.cpp

@@ -1,33 +0,0 @@
-/***************************************************************************
- *   Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de)              *
- *                                                                         *
- *   This file is part of the FreeCAD CAx development system.              *
- *                                                                         *
- *   This library is free software; you can redistribute it and/or         *
- *   modify it under the terms of the GNU Library General Public           *
- *   License as published by the Free Software Foundation; either          *
- *   version 2 of the License, or (at your option) any later version.      *
- *                                                                         *
- *   This library  is distributed in the hope that it will be useful,      *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU Library General Public License for more details.                  *
- *                                                                         *
- *   You should have received a copy of the GNU Library General Public     *
- *   License along with this library; see the file COPYING.LIB. If not,    *
- *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
- *   Suite 330, Boston, MA  02111-1307, USA                                *
- *                                                                         *
- ***************************************************************************/
-
-
-#include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
-
-
-/* registration table  */
-struct PyMethodDef Complete_methods[] = {
-    {NULL, NULL}        /* end of table marker */
-};

src/Mod/Complete/App/CMakeLists.txt

@@ -15,7 +15,6 @@ set(Complete_LIBS
 
 SET(Complete_SRCS
     AppComplete.cpp
-    AppCompletePy.cpp
     PreCompiled.cpp
     PreCompiled.h
     CompleteConfiguration.h