diff --git a/src/Tools/generate.py b/src/Tools/generate.py index 5c4d7047c1..02fd51b4df 100644 --- a/src/Tools/generate.py +++ b/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: diff --git a/src/Tools/generateBase/generateDS.py b/src/Tools/generateBase/generateDS.py index e7e3e31414..c9d79d4bc7 100644 --- a/src/Tools/generateBase/generateDS.py +++ b/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 diff --git a/src/Tools/generateTemplates/template.py b/src/Tools/generateTemplates/template.py index 750eae18ba..f152b4f9fc 100644 --- a/src/Tools/generateTemplates/template.py +++ b/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!") diff --git a/src/Tools/generateTemplates/templateModule.py b/src/Tools/generateTemplates/templateModule.py index 5e5322a1c7..779060ed72 100644 --- a/src/Tools/generateTemplates/templateModule.py +++ b/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 diff --git a/src/Tools/generateTemplates/templateModuleApp.py b/src/Tools/generateTemplates/templateModuleApp.py index 54bb656e87..6c36420929 100644 --- a/src/Tools/generateTemplates/templateModuleApp.py +++ b/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 diff --git a/src/Tools/generateTemplates/templateModuleAppFeature.py b/src/Tools/generateTemplates/templateModuleAppFeature.py index 88516ed346..7b02aae87f 100644 --- a/src/Tools/generateTemplates/templateModuleAppFeature.py +++ b/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; } -""" \ No newline at end of file +""" diff --git a/src/Tools/generateTemplates/templateModuleAppMain.py b/src/Tools/generateTemplates/templateModuleAppMain.py index 6af2ffc85a..920e9ddca7 100644 --- a/src/Tools/generateTemplates/templateModuleAppMain.py +++ b/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" -""" \ No newline at end of file +""" diff --git a/src/Tools/generateTemplates/templateModuleGui.py b/src/Tools/generateTemplates/templateModuleGui.py index 4212e5b86d..fc0975863b 100644 --- a/src/Tools/generateTemplates/templateModuleGui.py +++ b/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!")