py3: src/Tools: python3 diff, 2. part

issue 0000995

src/Tools/generate.py

@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 # (c) 2006 Jürgen Riegel  GPL
 
+from __future__ import print_function # this allows py2 to print(str1, str2) correctly
+
 Usage = """generate - generates a FreeCAD Module out of an XML model
 
 Usage:

src/Tools/generateBase/generateDS.py

@@ -26,7 +26,7 @@
 
 
 
-#from __future__ import generators   # only needed for Python 2.2
+# from __future__ import generators   # only needed for Python 2.2
 
 import sys
 import os.path

src/Tools/generateTemplates/template.py

@@ -4,5 +4,5 @@
 
 class ModelTemplate:
     def Generate(self):
-        print "Genertate() needs to be implemented in a Template class!"
+        print("Generate() needs to be implemented in a Template class!")
 

src/Tools/generateTemplates/templateModule.py

@@ -2,12 +2,12 @@
 # -*- coding: utf-8 -*-
 # (c) 2006 Juergen Riegel 
 
-import template, templateModuleApp,templateModuleGui
+from . import template, templateModuleApp,templateModuleGui
 import generateBase.generateModel_Module
 
 class TemplateModule (template.ModelTemplate):
     def Generate(self):
-        print "generateBase.generateModel_Module.Generate()\n"
+        print("generateBase.generateModel_Module.Generate()\n")
         App= templateModuleApp.TemplateModuleApp()
         App.path   = self.path 
         App.module = self.module

src/Tools/generateTemplates/templateModuleApp.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2007 Juergen Riegel 
 
-import template, templateModuleAppMain, templateModuleAppFeature
+from . import template, templateModuleAppMain, templateModuleAppFeature
 import generateBase.generateModel_Module
 import generateBase.generateTools
 

src/Tools/generateTemplates/templateModuleAppFeature.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2006 Juergen Riegel 
 
-import template
+from . import template
 import generateBase.generateModel_Module
 import generateBase.generateTools
 
@@ -85,4 +85,4 @@ int @self.feature.Name@::execute(void)
    return 0;
 }
 
-"""
+"""

src/Tools/generateTemplates/templateModuleAppMain.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2006 Juergen Riegel 
 
-import template
+from . import template
 import generateBase.generateModel_Module
 import generateBase.generateTools
 
@@ -50,4 +50,4 @@ void App@self.module.Name@Export init@self.module.Name@() {
 }
 
 } // extern "C"
-"""
+"""

src/Tools/generateTemplates/templateModuleGui.py

@@ -2,10 +2,10 @@
 # -*- coding: utf-8 -*-
 # (c) 2006 Juergen Riegel 
 
-import template
+from . import template
 import generateBase.generateModel_Module
 
 class TemplateModuleGui (template.ModelTemplate):
     def Generate(self):
-        print "Genertate() needs to be implemented in a Template class!"
+        print("Genertate() needs to be implemented in a Template class!")