From f610f525bac26cbd0e33aed1ed0ee42989db1ec3 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Fri, 10 Feb 2017 06:44:40 -0800 Subject: [PATCH] Use getattr directly, insead of doing a check then setting it (yay for defaults) --- gui/builtinViews/fittingView.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 8e1342768..3584f869f 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -406,13 +406,10 @@ class FittingView(d.Display): if mod1.slot != mod2.slot: return - if not getattr(mod2, "modPosition"): - self.mods.modPosition = mod2.modPosition = dstRow - if clone and mod2.isEmpty: - sFit.cloneModule(self.mainFrame.getActiveFit(), srcIdx, mod2.modPosition) + sFit.cloneModule(self.mainFrame.getActiveFit(), srcIdx, getattr(mod2, "modPosition", dstRow)) else: - sFit.swapModules(self.mainFrame.getActiveFit(), srcIdx, mod2.modPosition) + sFit.swapModules(self.mainFrame.getActiveFit(), srcIdx, getattr(mod2, "modPosition", dstRow)) wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))