Tox fixes

gui/builtinPreferenceViews/pyfaCrestPreferences.py

@@ -5,13 +5,13 @@ from gui.bitmapLoader import BitmapLoader
 
 import gui.mainFrame
 
-if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)):
-    from service.crest import Crest
-
 from service.settings import CRESTSettings
 
 from wx.lib.intctrl import IntCtrl
 
+if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)):
+    from service.crest import Crest
+
 
 class PFCrestPref(PreferenceView):
     title = "CREST"

gui/builtinStatsViews/miningyieldViewFull.py

@@ -127,7 +127,7 @@ class MiningYieldViewFull(StatsView):
     def refreshPanel(self, fit):
         # If we did anything intresting, we'd update our labels to reflect the new fit's stats here
 
-        stats = (("labelFullminingyieldMiner", lambda: fit.minerYield, 3, 0, 0, u"%s m\u00B3/s",None),
+        stats = (("labelFullminingyieldMiner", lambda: fit.minerYield, 3, 0, 0, u"%s m\u00B3/s", None),
                  ("labelFullminingyieldDrone", lambda: fit.droneYield, 3, 0, 0, u"%s m\u00B3/s", None),
                  ("labelFullminingyieldTotal", lambda: fit.totalYield, 3, 0, 0, u"%s m\u00B3/s", None))
 

gui/builtinViews/fittingView.py

@@ -230,7 +230,7 @@ class FittingView(d.Display):
 
         if row != -1 and row not in self.blanks:
             data = wx.PyTextDataObject()
-            data.SetText("fitting:"+str(self.mods[row].modPosition))
+            data.SetText("fitting:" + str(self.mods[row].modPosition))
 
             dropSource = wx.DropSource(self)
             dropSource.SetData(data)
@@ -403,7 +403,7 @@ class FittingView(d.Display):
                 return
 
             if clone and mod2.isEmpty:
-                sFit.cloneModule(self.mainFrame.getActiveFit(), srcIdx,  mod2.modPosition)
+                sFit.cloneModule(self.mainFrame.getActiveFit(), srcIdx, mod2.modPosition)
             else:
                 sFit.swapModules(self.mainFrame.getActiveFit(), srcIdx, mod2.modPosition)
 
@@ -503,7 +503,7 @@ class FittingView(d.Display):
 
                 itemContext = "Tactical Mode"
                 fullContext = (srcContext, itemContext)
-                if not srcContext in tuple(fCtxt[0] for fCtxt in contexts):
+                if srcContext not in tuple(fCtxt[0] for fCtxt in contexts):
                     contexts.append(fullContext)
 
                 selection.append(mod)

gui/crestFittings.py

@@ -4,9 +4,6 @@ import json
 import wx
 import requests
 
-if not 'wxMac' in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3,0)):
-    from service.crest import Crest, CrestModes
-
 from service.port import Port
 from service.fit import Fit
 
@@ -16,6 +13,9 @@ from eos.db import getItem
 import gui.display as d
 import gui.globalEvents as GE
 
+if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)):
+    from service.crest import Crest, CrestModes
+
 
 class CrestFittings(wx.Frame):
     def __init__(self, parent):

gui/graphFrame.py

@@ -19,7 +19,6 @@
 
 import os
 import logging
-logger = logging.getLogger(__name__)
 
 import wx
 
@@ -39,6 +38,9 @@ try:
     mplImported = False
 except ImportError:
     enabled = False
+
+logger = logging.getLogger(__name__)
+if not enabled:
     logger.info("Problems importing matplotlib; continuing without graphs")
 
 

gui/itemStats.py

@@ -834,7 +834,6 @@ class ItemEffects(wx.Panel):
         If effect file does not exist, create it
         """
 
-        import os
         file_ = config.getPyfaPath(os.path.join("eos", "effects", "%s.py" % event.GetText().lower()))
 
         if not os.path.isfile(file_):

gui/marketBrowser.py

@@ -31,6 +31,7 @@ ItemSelected, ITEM_SELECTED = wx.lib.newevent.NewEvent()
 RECENTLY_USED_MODULES = -2
 MAX_RECENTLY_USED_MODULES = 20
 
+
 class MetaButton(wx.ToggleButton):
     def __init__(self, *args, **kwargs):
         super(MetaButton, self).__init__(*args, **kwargs)
@@ -50,6 +51,7 @@ class MetaButton(wx.ToggleButton):
         self.Enable(True)
         self.SetValue(self.userSelected)
 
+
 class MarketBrowser(wx.Panel):
     def __init__(self, parent):
         wx.Panel.__init__(self, parent)