From da1081bc988894637f66d83f75e1050bdbd09283 Mon Sep 17 00:00:00 2001 From: Priit Laes Date: Sat, 12 Mar 2016 14:42:43 +0200 Subject: [PATCH] python: PartDesign: *.py: Fix python3 syntax --- src/Mod/PartDesign/InitGui.py | 5 +++-- src/Mod/PartDesign/Scripts/FilletArc.py | 4 ++-- src/Mod/PartDesign/Scripts/RadialCopy.py | 2 +- src/Mod/PartDesign/WizardShaft/SegmentFunction.py | 2 +- src/Mod/PartDesign/WizardShaft/Shaft.py | 2 +- src/Mod/PartDesign/fcgear/svggear.py | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Mod/PartDesign/InitGui.py b/src/Mod/PartDesign/InitGui.py index 5a6dba048..1d07369e1 100644 --- a/src/Mod/PartDesign/InitGui.py +++ b/src/Mod/PartDesign/InitGui.py @@ -41,17 +41,18 @@ class PartDesignWorkbench ( Workbench ): try: from WizardShaft import WizardShaft except ImportError: - print "Wizard shaft module cannot be loaded" + print("Wizard shaft module cannot be loaded") try: from FeatureHole import HoleGui except: pass + import PartDesignGui import PartDesign try: import InvoluteGearFeature except ImportError: - print "Involute gear module cannot be loaded" + print("Involute gear module cannot be loaded") #try: # from FeatureHole import HoleGui #except: diff --git a/src/Mod/PartDesign/Scripts/FilletArc.py b/src/Mod/PartDesign/Scripts/FilletArc.py index 75c177811..63f262ae5 100644 --- a/src/Mod/PartDesign/Scripts/FilletArc.py +++ b/src/Mod/PartDesign/Scripts/FilletArc.py @@ -85,9 +85,9 @@ def makeFilletArc(M1,P,Q,N,r2,ccw): t = t2 br2 = b.mult(r2) - print br2 + print(br2) ut = u.mult(t) - print ut + print(ut) M2 = P.add(ut).add(br2) S1 = M1.mult(r2/(r1+r2)).add(M2.mult(r1/(r1+r2))) S2 = M2.sub(br2) diff --git a/src/Mod/PartDesign/Scripts/RadialCopy.py b/src/Mod/PartDesign/Scripts/RadialCopy.py index d1c93b41c..01bb7885c 100644 --- a/src/Mod/PartDesign/Scripts/RadialCopy.py +++ b/src/Mod/PartDesign/Scripts/RadialCopy.py @@ -47,7 +47,7 @@ def makeRadialCopy(): sel = sel[0] shape = sel.Shape name = sel.Label - except IndexError, AttributeError: + except (IndexError, AttributeError): QtGui.QMessageBox.critical(None,"Wrong selection","Please select a shape object") #raise Exception("Nothing selected") else: diff --git a/src/Mod/PartDesign/WizardShaft/SegmentFunction.py b/src/Mod/PartDesign/WizardShaft/SegmentFunction.py index bb70d9ca7..9cb8ed01a 100644 --- a/src/Mod/PartDesign/WizardShaft/SegmentFunction.py +++ b/src/Mod/PartDesign/WizardShaft/SegmentFunction.py @@ -350,7 +350,7 @@ class TranslationFunction: try: self.boundaries = np.linalg.solve(A, b) # A * self.boundaries = b - except np.linalg.linalg.LinAlgError, e: + except np.linalg.linalg.LinAlgError as e: FreeCAD.Console.PrintMessage(e.message) FreeCAD.Console.PrintMessage(". No solution possible.\n") return diff --git a/src/Mod/PartDesign/WizardShaft/Shaft.py b/src/Mod/PartDesign/WizardShaft/Shaft.py index c3a2c5acc..c06174d77 100644 --- a/src/Mod/PartDesign/WizardShaft/Shaft.py +++ b/src/Mod/PartDesign/WizardShaft/Shaft.py @@ -478,7 +478,7 @@ class Shaft: b = np.array([coefficientsF[ax][0], coefficientsM[ax][0]]) try: solution = np.linalg.solve(A, b) # A * solution = b - except np.linalg.linalg.LinAlgError, e: + except np.linalg.linalg.LinAlgError as e: FreeCAD.Console.PrintMessage(e.message) FreeCAD.Console.PrintMessage(". No solution possible.\n") self.parent.updateButtons(ax, False) diff --git a/src/Mod/PartDesign/fcgear/svggear.py b/src/Mod/PartDesign/fcgear/svggear.py index 14e5d66ff..0752290ec 100644 --- a/src/Mod/PartDesign/fcgear/svggear.py +++ b/src/Mod/PartDesign/fcgear/svggear.py @@ -67,5 +67,5 @@ if __name__ == '__main__': if len(args) != 2: p.error() m, Z = [float(v) for v in args] - print makeGear(m, int(Z), float(opts.angle)) + print(makeGear(m, int(Z), float(opts.angle)))