From 1dbbb4371bca6114192eaa4f99ba71514b82a1e2 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 27 Nov 2018 18:13:35 +0100 Subject: [PATCH] Py3: Port Wizard shaft to Python 3 --- src/Mod/PartDesign/WizardShaft/SegmentFunction.py | 4 ++-- src/Mod/PartDesign/WizardShaft/WizardShaftTable.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mod/PartDesign/WizardShaft/SegmentFunction.py b/src/Mod/PartDesign/WizardShaft/SegmentFunction.py index 9cb8ed01a4..d07f29fae9 100644 --- a/src/Mod/PartDesign/WizardShaft/SegmentFunction.py +++ b/src/Mod/PartDesign/WizardShaft/SegmentFunction.py @@ -120,7 +120,7 @@ class SegmentFunction: def buildFromDict(self, var, dict): self.variable = var - for key in sorted(dict.iterkeys()): + for key in sorted(dict.keys()): #if abs(dict[key]) > 1E-9: self.segments.append(SegmentFunctionSegment(key, var, dict[key], 0)) @@ -129,7 +129,7 @@ class SegmentFunction: self.segments.insert(self.index(st), SegmentFunctionSegment(st, self.variable, coeff, exp)) def addSegments(self, dict): - for key in sorted(dict.iterkeys()): + for key in sorted(dict.keys()): self.addSegment(key, dict[key]) def setMaxX(self, mx): diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py b/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py index dda2bec869..2bfc3665e3 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py +++ b/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py @@ -50,7 +50,7 @@ class WizardShaftTable: ] def __init__(self, w, s): - for key in self.rowDict.iterkeys(): + for key in iter(self.rowDict.keys()): self.rowDictReverse[self.rowDict[key]] = key # Set parent wizard (for connecting slots) self.wizard = w