Get back into tox's good graces

Author: blitzmann

eos/db/saveddata/character.py

@@ -29,9 +29,6 @@
 from eos.saveddata.character import Character, Skill
 from eos.saveddata.ssocharacter import SsoCharacter
 
-
-
-
 characters_table = Table("characters", saveddata_meta,
                          Column("ID", Integer, primary_key=True),
                          Column("name", String, nullable=False),

eos/effects/warpscrambleblockmwdwithnpceffect.py

@@ -17,8 +17,8 @@ def handler(fit, module, context):
     # this is such a dirty hack
     for mod in fit.modules:
         if not mod.isEmpty and mod.state > State.ONLINE and (
-                mod.item.requiresSkill("Micro Jump Drive Operation")
-                or mod.item.requiresSkill("High Speed Maneuvering")
+                mod.item.requiresSkill("Micro Jump Drive Operation") or
+                mod.item.requiresSkill("High Speed Maneuvering")
         ):
             mod.state = State.ONLINE
         if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > State.ONLINE:

eos/saveddata/character.py

@@ -170,7 +170,6 @@ def setSsoCharacter(self, character, clientHash):
                 if x.client == clientHash:
                     self.__ssoCharacters.remove(x)
 
-
     def getSsoCharacter(self, clientHash):
         return next((x for x in self.__ssoCharacters if x.client == clientHash), None)
 

eos/saveddata/ssocharacter.py

@@ -33,7 +33,6 @@ def __init__(self, charID, name, client, accessToken=None, refreshToken=None):
         self.refreshToken = refreshToken
         self.accessTokenExpires = None
 
-
     @reconstructor
     def init(self):
         pass

gui/builtinPreferenceViews/pyfaEsiPreferences.py

@@ -43,13 +43,17 @@ def populatePanel(self, panel):
         rbSizer = wx.BoxSizer(wx.HORIZONTAL)
         self.rbMode = wx.RadioBox(panel, -1, "Login Authentication Method", wx.DefaultPosition, wx.DefaultSize,
                                   ['Local Server', 'Manual'], 1, wx.RA_SPECIFY_COLS)
-        self.rbMode.SetItemToolTip(0, "This options starts a local webserver that the web application will call back to with information about the character login.")
-        self.rbMode.SetItemToolTip(1, "This option prompts users to copy and paste information from the web application to allow for character login. Use this if having issues with the local server.")
+        self.rbMode.SetItemToolTip(0, "This options starts a local webserver that the web application will call back to"
+                                      " with information about the character login.")
+        self.rbMode.SetItemToolTip(1, "This option prompts users to copy and paste information from the web application "
+                                      "to allow for character login. Use this if having issues with the local server.")
 
         self.rbSsoMode = wx.RadioBox(panel, -1, "SSO Mode", wx.DefaultPosition, wx.DefaultSize,
                                      ['pyfa.io', 'Custom application'], 1, wx.RA_SPECIFY_COLS)
-        self.rbSsoMode.SetItemToolTip(0, "This options routes SSO Logins through pyfa.io, allowing you to easily login without any configuration. When in doubt, use this option.")
-        self.rbSsoMode.SetItemToolTip(1, "This option goes through EVE SSO directly, but requires more configuration. Use this is pyfa.io is blocked for some reason, or if you do not wish to route data throguh pyfa.io.")
+        self.rbSsoMode.SetItemToolTip(0, "This options routes SSO Logins through pyfa.io, allowing you to easily login "
+                                         "without any configuration. When in doubt, use this option.")
+        self.rbSsoMode.SetItemToolTip(1, "This option goes through EVE SSO directly, but requires more configuration. Use "
+                                         "this is pyfa.io is blocked for some reason, or if you do not wish to route data throguh pyfa.io.")
 
         self.rbMode.SetSelection(self.settings.get('loginMode'))
         self.rbSsoMode.SetSelection(self.settings.get('ssoMode'))
@@ -70,12 +74,6 @@ def populatePanel(self, panel):
         mainSizer.Add(wx.StaticLine(panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL), 0,
                       wx.EXPAND, 5)
 
-        # self.stInfo = wx.StaticText(panel, wx.ID_ANY,
-        #                             u"Using custom applications details will let pyfa to access the SSO under your application, rather than the pyfa application that is automatically set up. This requires you to set up your own ESI client application and accept CCPs License Agreement. Additionally, when setting up your client, make sure the callback url is set to 'http://localhost:6461'. Please see the pyfa wiki for more information regarding this",
-        #                             wx.DefaultPosition, wx.DefaultSize, 0)
-        # self.stInfo.Wrap(dlgWidth)
-        # mainSizer.Add(self.stInfo, 0, wx.EXPAND | wx.TOP | wx.BOTTOM, 5)
-
         fgAddrSizer = wx.FlexGridSizer(2, 2, 0, 0)
         fgAddrSizer.AddGrowableCol(1)
         fgAddrSizer.SetFlexibleDirection(wx.BOTH)
@@ -105,10 +103,6 @@ def populatePanel(self, panel):
 
         mainSizer.Add(fgAddrSizer, 0, wx.EXPAND, 5)
 
-
-
-        timeoutSizer = wx.BoxSizer(wx.HORIZONTAL)
-
         # self.stTimout = wx.StaticText(panel, wx.ID_ANY, "Timeout (seconds):", wx.DefaultPosition, wx.DefaultSize, 0)
         # self.stTimout.Wrap(-1)
         #

gui/builtinPreferenceViews/pyfaNetworkPreferences.py

@@ -150,10 +150,10 @@ def populatePanel(self, panel):
         proxy = self.settings.autodetect()
 
         if proxy is not None:
-             addr, port = proxy
-             txt = addr + ":" + str(port)
+            addr, port = proxy
+            txt = addr + ":" + str(port)
         else:
-             txt = "None"
+            txt = "None"
 
         self.stPSAutoDetected.SetLabel("Auto-detected: " + txt)
         self.stPSAutoDetected.Disable()

gui/builtinStatsViews/firepowerViewFull.py

@@ -129,7 +129,7 @@ def switchToMiningYieldView(self, event):
         # Remove effective label
         hsizer = self.headerPanel.GetSizer()
         hsizer.Hide(self.stEff)
-        #self.stEff.Destroy()
+        # self.stEff.Destroy()
 
         # Get the new view
         view = StatsView.getView("miningyieldViewFull")(self.parent)

gui/characterEditor.py

@@ -830,7 +830,6 @@ def charChanged(self, event):
             if sso is None:
                 self.charChoice.SetSelection(noneID)
 
-
         #
         # if chars:
         #     for charName in chars:

gui/characterSelection.py

@@ -170,7 +170,6 @@ def refreshAPICallback(self, e=None):
     def charChanged(self, event):
         fitID = self.mainFrame.getActiveFit()
         charID = self.getActiveCharacter()
-        sChar = Character.getInstance()
 
         if charID == -1:
             # revert to previous character

gui/chrome_tabs.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 #
 # ToDo: Bug - when selecting close on a tab, sometimes the tab to the right is
 #       selected, most likely due to determination of mouse position
@@ -11,7 +11,7 @@
 #       tab index?). This will also help with finding close buttons.
 # ToDo: Fix page preview code (PFNotebookPagePreview)
 #
-#= ==============================================================================
+# ===============================================================================
 
 import wx
 import wx.lib.newevent
@@ -413,7 +413,7 @@ def GetMinSize(self):
         mdc.SelectObject(ebmp)
         mdc.SetFont(self.font)
         textSizeX, textSizeY = mdc.GetTextExtent(self.text)
-        totalSize = self.left_width + self.right_width + textSizeX + self.close_btn_width / 2 + 16 + self.padding* 2
+        totalSize = self.left_width + self.right_width + textSizeX + self.close_btn_width / 2 + 16 + self.padding * 2
         mdc.SelectObject(wx.NullBitmap)
         return totalSize, self.tab_height
 
@@ -1478,4 +1478,3 @@ def OnCreate(self, event):
     top = Frame("Test Chrome Tabs")
     top.Show()
     app.MainLoop()
-

gui/esiFittings.py

@@ -29,7 +29,6 @@ def __init__(self, parent):
 
         self.mainFrame = parent
         mainSizer = wx.BoxSizer(wx.VERTICAL)
-        sEsi = Esi.getInstance()
 
         characterSelectSizer = wx.BoxSizer(wx.HORIZONTAL)
 
@@ -119,10 +118,11 @@ def fetchFittings(self, event):
             pyfalog.error(msg)
             self.statusbar.SetStatusText(msg)
         except APIException as ex:
-            del waitDialog  # Can't do this in a finally because then it obscures the message dialog
+            #  Can't do this in a finally because then it obscures the message dialog
+            del waitDialog  # noqa: F821
             ESIExceptionHandler(self, ex)
         except Exception as ex:
-            del waitDialog
+            del waitDialog  # noqa: F821
             raise ex
 
     def importFitting(self, event):
@@ -180,7 +180,6 @@ def __init__(self, parent):
         self.mainFrame = parent
         self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNFACE))
 
-        sEsi = Esi.getInstance()
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         hSizer = wx.BoxSizer(wx.HORIZONTAL)
 
@@ -232,7 +231,6 @@ def getActiveCharacter(self):
         return self.charChoice.GetClientData(selection) if selection is not None else None
 
     def exportFitting(self, event):
-        sPort = Port.getInstance()
         fitID = self.mainFrame.getActiveFit()
 
         self.statusbar.SetStatusText("", 0)
@@ -242,12 +240,8 @@ def exportFitting(self, event):
             return
 
         self.statusbar.SetStatusText("Sending request and awaiting response", 1)
-        sEsi = Esi.getInstance()
 
         try:
-            sFit = Fit.getInstance()
-            data = sPort.exportESI(sFit.getFit(fitID))
-            res = sEsi.postFitting(self.getActiveCharacter(), data)
 
             self.statusbar.SetStatusText("", 0)
             self.statusbar.SetStatusText("", 1)
@@ -307,7 +301,7 @@ def __init__(self, parent):
 
     def ssoLogin(self, event):
         if (self):
-            #todo: these events don't unbind properly when window is closed (?), hence the `if`. Figure out better way of doing this.
+            # todo: these events don't unbind properly when window is closed (?), hence the `if`. Figure out better way of doing this.
             self.popCharList()
             event.Skip()
 

gui/ssoLogin.py

@@ -1,5 +1,6 @@
 import wx
 
+
 class SsoLogin(wx.Dialog):
     def __init__(self, parent):
         wx.Dialog.__init__(self, parent, id=wx.ID_ANY, title="SSO Login", size=wx.Size(400, 240))

gui/updateDialog.py

@@ -76,7 +76,7 @@ def __init__(self, parent, release, version):
             releaseDate.strftime('%B %d, %Y'),
             "<p class='text-danger'><b>This is a pre-release, be prepared for unstable features</b></p>" if version.is_prerelease else "",
             markdowner.convert(self.releaseInfo['body'])
-        ),"")
+        ), "")
 
         notesSizer.Add(self.browser, 1, wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP, 5)
         mainSizer.Add(notesSizer, 1, wx.EXPAND, 5)

gui/utils/exportHtml.py

@@ -86,7 +86,7 @@ def generateFullHTML(self, sMkt, sFit, dnaUrl):
   <head>
   <title>Pyfa Fittings</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta charset="utf-8" /> 
+  <meta charset="utf-8" />
   <link rel="stylesheet" href="https://code.jquery.com/mobile/1.4.2/jquery.mobile-1.4.2.min.css" />
   <script src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
   <script>

service/character.py

@@ -123,6 +123,7 @@ def run(self):
 
         wx.CallAfter(self.callback)
 
+
 class Character(object):
     instance = None
     skillReqsDict = {}

service/esi.py

@@ -17,7 +17,6 @@
 from service.settings import EsiSettings
 from service.esiAccess import EsiAccess
 
-import wx
 from requests import Session
 
 pyfalog = Logger(__name__)
@@ -108,7 +107,8 @@ def login(self):
         serverAddr = None
         # always start the local server if user is using client details. Otherwise, start only if they choose to do so.
         if self.settings.get('ssoMode') == SsoMode.CUSTOM or self.settings.get('loginMode') == LoginMethod.SERVER:
-            serverAddr = self.startServer(6461 if self.settings.get('ssoMode') == SsoMode.CUSTOM else 0)  # random port, or if it's custom application, use a defined port
+            # random port, or if it's custom application, use a defined port
+            serverAddr = self.startServer(6461 if self.settings.get('ssoMode') == SsoMode.CUSTOM else 0)
         uri = self.getLoginURI(serverAddr)
         webbrowser.open(uri)
         wx.PostEvent(self.mainFrame, GE.SsoLoggingIn(sso_mode=self.settings.get('ssoMode'), login_mode=self.settings.get('loginMode')))
@@ -181,4 +181,3 @@ def handleServerLogin(self, message):
         pyfalog.debug("Handling SSO login with: {0}", message)
 
         self.handleLogin(message)
-

service/esiAccess.py

@@ -180,7 +180,7 @@ def get_refresh_token_params(self, refreshToken):
         data = {
             'grant_type': 'refresh_token',
             'refresh_token': refreshToken,
-            }
+        }
 
         if self.settings.get('ssoMode') == SsoMode.AUTO:
             # data is all we really need, the rest is handled automatically by pyfa.io
@@ -281,4 +281,3 @@ def delete(self, ssoChar, endpoint, *args, **kwargs):
         self._before_request(ssoChar)
         endpoint = endpoint.format(**kwargs)
         return self._after_request(self._session.delete("{}{}".format(self.esi_url, endpoint)))
-

service/fit.py

@@ -1209,11 +1209,9 @@ def recalc(self, fit):
         start_time = time()
         pyfalog.info("=" * 10 + "recalc: {0}" + "=" * 10, fit.name)
 
-
         fit.factorReload = self.serviceFittingOptions["useGlobalForceReload"]
         fit.clear()
 
         fit.calculateModifiedAttributes()
 
         pyfalog.info("=" * 10 + "recalc time: " + str(time() - start_time) + "=" * 10)
-

service/jargon/jargon.py

@@ -20,17 +20,18 @@
 import config
 import pkg_resources
 
+
 class Jargon(object):
     def __init__(self, rawdata: dict):
         self._rawdata = rawdata
 
         # copy the data to lowercase keys, ignore blank keys
-        self._data = {str(k).lower():v for k,v in rawdata.items() if k}
+        self._data = {str(k).lower(): v for k, v in rawdata.items() if k}
 
     def get(self, term: str) -> str:
         return self._data.get(term.lower())
 
-    def get_rawdata() -> dict:
+    def get_rawdata(self) -> dict:
         return self._rawdata
 
     def apply(self, query):

service/jargon/loader.py

@@ -26,11 +26,12 @@
 
 JARGON_PATH = os.path.join(config.savePath, 'jargon.yaml')
 
+
 class JargonLoader(object):
     def __init__(self, jargon_path: str):
         self.jargon_path = jargon_path
-        self._jargon_mtime = 0 # type: int
-        self._jargon = None # type: Jargon
+        self._jargon_mtime = 0  # type: int
+        self._jargon = None  # type: Jargon
 
     def get_jargon(self) -> Jargon:
         if self._is_stale():
@@ -58,7 +59,7 @@ def _get_jargon_file_mtime(self) -> int:
     def init_user_jargon(jargon_path):
         values = yaml.load(DEFAULT_DATA)
 
-        ## Disabled for issue/1533; do not overwrite existing user config
+        # Disabled for issue/1533; do not overwrite existing user config
         # if os.path.exists(jargon_path):
         #     with open(jargon_path) as f:
         #         custom_values = yaml.load(f)
@@ -72,11 +73,13 @@ def init_user_jargon(jargon_path):
                 yaml.dump(values, stream=f, default_flow_style=False)
 
     _instance = None
+
     @staticmethod
     def instance(jargon_path=None):
         if not JargonLoader._instance:
             jargon_path = jargon_path or JARGON_PATH
             JargonLoader._instance = JargonLoader(jargon_path)
         return JargonLoader._instance
 
+
 JargonLoader.init_user_jargon(JARGON_PATH)

service/market.py

@@ -41,6 +41,7 @@
 # Event which tells threads dependent on Market that it's initialized
 mktRdy = threading.Event()
 
+
 class ShipBrowserWorkerThread(threading.Thread):
     def __init__(self):
         threading.Thread.__init__(self)
@@ -113,10 +114,8 @@ def processSearches(self):
             else:
                 filter_ = None
 
-
             jargon_request = self.jargonLoader.get_jargon().apply(request)
 
-
             results = []
             if len(request) >= config.minItemSearchLength:
                 results = eos.db.searchItems(request, where=filter_,

service/marketSources/evemarketdata.py

@@ -35,7 +35,7 @@ class EveMarketData(object):
     def __init__(self, types, system, priceMap):
         data = {}
         baseurl = "https://eve-marketdata.com/api/item_prices.xml"
-        data["system_id"] = system # Use Jita for market
+        data["system_id"] = system  # Use Jita for market
         data["type_ids"] = ','.join(str(x) for x in types)
 
         network = Network.getInstance()

service/port.py

@@ -58,6 +58,7 @@
 class ESIExportException(Exception):
     pass
 
+
 pyfalog = Logger(__name__)
 
 EFT_SLOT_ORDER = [Slot.LOW, Slot.MED, Slot.HIGH, Slot.RIG, Slot.SUBSYSTEM, Slot.SERVICE]
@@ -349,7 +350,6 @@ def exportESI(cls, ofit, callback=None):
 
         nested_dict = lambda: collections.defaultdict(nested_dict)
         fit = nested_dict()
-        sEsi = Esi.getInstance()
         sFit = svcFit.getInstance()
 
         # max length is 50 characters