From f2c84692a98bc1f68982dedbac6afa62cc335fe9 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Thu, 9 Feb 2017 00:22:14 -0800 Subject: [PATCH] Clean up a bunch of unused variables --- eos/gamedata.py | 2 +- gui/PFListPane.py | 2 -- gui/builtinContextMenus/amount.py | 1 - gui/builtinViews/fittingView.py | 4 +--- gui/characterEditor.py | 4 ++-- gui/chromeTabs.py | 4 +--- gui/pygauge.py | 2 -- gui/sfBrowserItem.py | 1 - gui/shipBrowser.py | 3 --- 9 files changed, 5 insertions(+), 18 deletions(-) diff --git a/eos/gamedata.py b/eos/gamedata.py index 10317dab2..ce32d3ab7 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -179,7 +179,7 @@ class Effect(EqBase): t = t if isinstance(t, tuple) or t is None else (t,) self.__type = t - except (ImportError, AttributeError) as e: + except (ImportError, AttributeError): self.__handler = effectDummy self.__runTime = "normal" self.__activeByDefault = True diff --git a/gui/PFListPane.py b/gui/PFListPane.py index 2c0b35d16..e6689ce8d 100644 --- a/gui/PFListPane.py +++ b/gui/PFListPane.py @@ -144,10 +144,8 @@ class PFListPane(wx.ScrolledWindow): elif doFocus: self.SetFocus() - clientW, clientH = self.GetSize() for i in xrange(len(self._wList)): iwidth, iheight = self._wList[i].GetSize() - itemX, itemY = self._wList[i].GetPosition() self._wList[i].SetSize((cwidth, iheight)) if doRefresh is True: self._wList[i].Refresh() diff --git a/gui/builtinContextMenus/amount.py b/gui/builtinContextMenus/amount.py index 95dba33f4..12d483243 100644 --- a/gui/builtinContextMenus/amount.py +++ b/gui/builtinContextMenus/amount.py @@ -50,7 +50,6 @@ class AmountChanger(wx.Dialog): self.button.Bind(wx.EVT_BUTTON, self.change) def change(self, event): - sFit = Fit.getInstance() if self.input.GetLineText(0).strip() == '': event.Skip() return diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index bcaa15aa7..02a5ae6c0 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -681,7 +681,6 @@ class FittingView(d.Display): isize = 16 headerSize = max(isize, tdc.GetTextExtent("W")[0]) + padding * 2 - maxWidth = 0 maxRowHeight = isize rows = 0 for st in self.mods: @@ -775,8 +774,7 @@ class FittingView(d.Display): bmp = col.bitmap opts.m_labelBitmap = bmp - width = render.DrawHeaderButton(self, mdc, (cx, padding, columnsWidths[i], headerSize), wx.CONTROL_CURRENT, - sortArrow=wx.HDR_SORT_ICON_NONE, params=opts) + render.DrawHeaderButton(self, mdc, (cx, padding, columnsWidths[i], headerSize), wx.CONTROL_CURRENT, sortArrow=wx.HDR_SORT_ICON_NONE, params=opts) cx += columnsWidths[i] diff --git a/gui/characterEditor.py b/gui/characterEditor.py index 37855e46c..1c7044f3e 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -628,9 +628,9 @@ class APIView(wx.Panel): try: activeChar = self.charEditor.entityEditor.getActiveEntity() list = sChar.apiCharList(activeChar.ID, self.inputID.GetLineText(0), self.inputKey.GetLineText(0)) - except AuthenticationError, e: + except AuthenticationError: self.stStatus.SetLabel("Authentication failure. Please check keyID and vCode combination.") - except TimeoutError, e: + except TimeoutError: self.stStatus.SetLabel("Request timed out. Please check network connectivity and/or proxy settings.") except Exception, e: self.stStatus.SetLabel("Error:\n%s" % e.message) diff --git a/gui/chromeTabs.py b/gui/chromeTabs.py index db4084e52..d4b50b713 100644 --- a/gui/chromeTabs.py +++ b/gui/chromeTabs.py @@ -1123,8 +1123,6 @@ class PFTabsContainer(wx.Panel): else: mdc = wx.BufferedPaintDC(self) - selected = 0 - if 'wxMac' in wx.PlatformInfo and wx.VERSION < (3, 0): color = wx.Colour(0, 0, 0) brush = wx.Brush(color) @@ -1260,7 +1258,7 @@ class PFTabsContainer(wx.Panel): if self.tabMinWidth < 1: self.tabMinWidth = 1 for tab in self.tabs: - w, h = tab.GetSize() + tab.GetSize() tab.SetSize((self.tabMinWidth, self.height)) if self.GetTabsCount() > 0: diff --git a/gui/pygauge.py b/gui/pygauge.py index 6287bbdf6..dbb0c4531 100644 --- a/gui/pygauge.py +++ b/gui/pygauge.py @@ -323,8 +323,6 @@ class PyGauge(wx.PyWindow): # time on them if not needed. See GH issue #282 pv = value - xv = 1 - transition = 0 if pv <= 100: xv = pv / 100 diff --git a/gui/sfBrowserItem.py b/gui/sfBrowserItem.py index 6ecdb0f9a..de9eb4001 100644 --- a/gui/sfBrowserItem.py +++ b/gui/sfBrowserItem.py @@ -137,7 +137,6 @@ class PFToolbar(object): return doRefresh def MouseClick(self, event): - mx, my = event.GetPosition() bx = self.toolbarX for button in self.buttons: if not button.IsVisible(): diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 90b624a41..6ccc1059b 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -629,7 +629,6 @@ class ShipBrowser(wx.Panel): event.Skip() def SizeRefreshList(self, event): - ewidth, eheight = event.GetSize() self.Layout() self.lpane.Layout() self.lpane.RefreshList(True) @@ -1871,8 +1870,6 @@ class FitItem(SFItem.SFBrowserItem): mdc.DrawBitmap(self.shipBmp, self.shipBmpx, self.shipBmpy, 0) - shipName, shipTrait, fittings, booster, timestamp = self.shipFittingInfo - mdc.SetFont(self.fontNormal) fitDate = time.localtime(self.timestamp)