Tox fixes

eos/db/gamedata/alphaClones.py

@@ -23,16 +23,20 @@
 from eos.db import gamedata_meta
 from eos.types import AlphaClone, AlphaCloneSkill
 
-alphaclones_table = Table("alphaClones", gamedata_meta,
-                         Column("alphaCloneID", Integer, primary_key=True),
-                         Column("alphaCloneName", String),
-                        )
+alphaclones_table = Table(
+        "alphaClones",
+        gamedata_meta,
+        Column("alphaCloneID", Integer, primary_key=True),
+        Column("alphaCloneName", String),
+)
 
-alphacloneskskills_table = Table("alphaCloneSkills", gamedata_meta,
-                         Column("alphaCloneID", Integer, ForeignKey("alphaClones.alphaCloneID"), primary_key=True),
-                         Column("typeID", Integer, primary_key=True),
-                         Column("level", Integer),
-                         )
+alphacloneskskills_table = Table(
+        "alphaCloneSkills",
+        gamedata_meta,
+        Column("alphaCloneID", Integer, ForeignKey("alphaClones.alphaCloneID"), primary_key=True),
+        Column("typeID", Integer, primary_key=True),
+        Column("level", Integer),
+)
 
 mapper(AlphaClone, alphaclones_table,
        properties={

eos/db/saveddata/databaseRepair.py

@@ -33,7 +33,7 @@ def ExecuteSQLQuery(saveddata_engine, query):
             results = saveddata_engine.execute(query)
             return results
         except sqlalchemy.exc.DatabaseError:
-            logger.error("Failed to connect to database or error executing query:\n%s",query)
+            logger.error("Failed to connect to database or error executing query:\n%s", query)
             return None
 
     @staticmethod

eos/db/saveddata/queries.py

@@ -22,11 +22,8 @@
 from eos.db import saveddata_session, sd_lock
 from eos.db.saveddata.fit import projectedFits_table
 from eos.db.util import processEager, processWhere
-from eos.db import saveddata_session, sd_lock
 
 from eos.types import *
-from eos.db.saveddata.fit import projectedFits_table
-from sqlalchemy.sql import and_
 import eos.config
 
 configVal = getattr(eos.config, "saveddataCache", None)

eos/effects/chargebonuswarfarecharge.py

@@ -4,7 +4,8 @@
 # Items from market group: Ammunition & Charges > Command Burst Charges (15 of 15)
 type = "active"
 
+
 def handler(fit, module, context):
     for x in xrange(1, 4):
         value = module.getModifiedChargeAttr("warfareBuff{}Multiplier".format(x))
-        module.multiplyItemAttr("warfareBuff{}Value".format(x), value)
+        module.multiplyItemAttr("warfareBuff{}Value".format(x), value)

eos/effects/elitebonuscommandshipinformationhiddencs3.py

@@ -1,5 +1,7 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                   "commandBonusHidden", module.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")

eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py

@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Rabisu
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange", src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")

eos/effects/energydestabilizationnew.py

@@ -5,8 +5,7 @@
 
 
 def handler(fit, src, context):
-    if "projected" in context and (
-                (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
+    if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
         multiplier = src.amountActive if hasattr(src, "amountActive") else 1
         amount = src.getModifiedItemAttr("energyNeutralizerAmount")
         time = src.getModifiedItemAttr("duration")

eos/effects/iceharvestingdroneoperationdurationbonus.py

@@ -4,6 +4,8 @@
 # Modules named like: Drone Mining Augmentor (8 of 8)
 # Skill: Ice Harvesting Drone Operation
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level if "skill" in context else 1
     fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting Drone Operation"), "duration", src.getModifiedItemAttr("rofBonus") * lvl)

eos/effects/miningforemanstrengthbonus.py

@@ -3,9 +3,11 @@
 # Used by:
 # Skill: Mining Director
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)

eos/effects/modulebonuswarfarelinkarmor.py

@@ -13,6 +13,8 @@
 '''
 
 type = "active", "gang"
+
+
 def handler(fit, module, context, **kwargs):
     for x in xrange(1, 5):
         if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
@@ -21,5 +23,3 @@ def handler(fit, module, context, **kwargs):
 
             if id:
                 fit.addCommandBonus(id, value, module, kwargs['effect'])
-
-

eos/effects/modulebonuswarfarelinkinfo.py

@@ -4,11 +4,13 @@
 # Variations of module: Information Command Burst I (2 of 2)
 
 type = "active", "gang"
+
+
 def handler(fit, module, context, **kwargs):
     for x in xrange(1, 5):
         if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
             value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
             id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
 
             if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
+                fit.addCommandBonus(id, value, module, kwargs['effect'])

eos/effects/modulebonuswarfarelinkmining.py

@@ -4,11 +4,13 @@
 # Variations of module: Mining Foreman Burst I (2 of 2)
 
 type = "active", "gang"
+
+
 def handler(fit, module, context, **kwargs):
     for x in xrange(1, 5):
         if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
             value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
             id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
 
             if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
+                fit.addCommandBonus(id, value, module, kwargs['effect'])

eos/effects/modulebonuswarfarelinkshield.py

@@ -4,11 +4,13 @@
 # Variations of module: Shield Command Burst I (2 of 2)
 
 type = "active", "gang"
+
+
 def handler(fit, module, context, **kwargs):
     for x in xrange(1, 5):
         if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
             value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
             id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
 
             if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
+                fit.addCommandBonus(id, value, module, kwargs['effect'])

eos/effects/modulebonuswarfarelinkskirmish.py

@@ -4,11 +4,13 @@
 # Variations of module: Skirmish Command Burst I (2 of 2)
 
 type = "active", "gang"
+
+
 def handler(fit, module, context, **kwargs):
     for x in xrange(1, 5):
         if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
             value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
             id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
 
             if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
+                fit.addCommandBonus(id, value, module, kwargs['effect'])

eos/effects/moduletitaneffectgenerator.py

@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Titan Phenomena Generator (4 of 4)
 type = "active", "gang"
+
+
 def handler(fit, module, context, **kwargs):
     for x in xrange(1, 5):
         if module.getModifiedItemAttr("warfareBuff{}ID".format(x)):
@@ -11,7 +13,3 @@ def handler(fit, module, context, **kwargs):
 
             if id:
                 fit.addCommandBonus(id, value, module, kwargs['effect'])
-
-
-
-

eos/effects/remotehullrepair.py

@@ -4,7 +4,8 @@
 
 
 def handler(fit, module, context):
-    if "projected" not in context: return
+    if "projected" not in context:
+        return
     bonus = module.getModifiedItemAttr("structureDamageAmount")
     duration = module.getModifiedItemAttr("duration") / 1000.0
     fit.extraAttributes.increase("hullRepair", bonus / duration)

eos/effects/rolebonusremotearmorrepairoptimalfalloff.py

@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Rabisu
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("roleBonusRepairRange"))
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange", src.getModifiedItemAttr("roleBonusRepairRange"))

eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py

@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Apostle
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"), "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"), "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")

eos/effects/shipmodesmallmissiledamagepostdiv.py

@@ -11,5 +11,5 @@ def handler(fit, module, context):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
                                            "{}Damage".format(type),
                                            1 / module.getModifiedItemAttr("modeDamageBonusPostDiv"),
-                                           stackingPenalties = True,
+                                           stackingPenalties=True,
                                            penaltyGroup="postDiv")

eos/effects/structurerigmaxtargets.py

@@ -4,4 +4,3 @@
 
 def handler(fit, src, context):
     fit.extraAttributes.increase("maxTargetsLockedFromSkills", src.getModifiedItemAttr("structureRigMaxTargetBonus"))
-

eos/saveddata/fighter.py

@@ -148,10 +148,6 @@ def isInvalid(self):
     def item(self):
         return self.__item
 
-    @property
-    def charge(self):
-        return self.__charge
-
     @property
     def hasAmmo(self):
         return self.charge is not None

eos/saveddata/fit.py

@@ -487,11 +487,9 @@ def __runCommandBoosts(self, runTime="normal"):
                         self.ship.boostItemAttr("armor%sDamageResonance" % damageType, value)
 
                 if warfareBuffID == 14:  # Armor Burst: Rapid Repair: Repair Duration/Capacitor
-                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(
-                        "Remote Armor Repair Systems") or mod.item.requiresSkill("Repair Systems"),
+                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or mod.item.requiresSkill("Repair Systems"),
                                                   "capacitorNeed", value)
-                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(
-                        "Remote Armor Repair Systems") or mod.item.requiresSkill("Repair Systems"), "duration",
+                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or mod.item.requiresSkill("Repair Systems"), "duration",
                                                   value)
 
                 if warfareBuffID == 15:  # Armor Burst: Armor Reinforcement: Armor HP
@@ -512,9 +510,8 @@ def __runCommandBoosts(self, runTime="normal"):
                                                       "scan%sStrengthBonus" % scanType, value,
                                                       stackingPenalties=True)
 
-                    for attr in (
-                    "missileVelocityBonus", "explosionDelayBonus", "aoeVelocityBonus", "falloffBonus",
-                    "maxRangeBonus", "aoeCloudSizeBonus", "trackingSpeedBonus"):
+                    for attr in ("missileVelocityBonus", "explosionDelayBonus", "aoeVelocityBonus", "falloffBonus",
+                                 "maxRangeBonus", "aoeCloudSizeBonus", "trackingSpeedBonus"):
                         self.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
                                                       attr, value)
 

gui/builtinPreferenceViews/pyfaCrestPreferences.py

@@ -5,13 +5,13 @@
 
 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 @@ def switchToFirepowerView(self, event):
     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 @@ def startDrag(self, event):
 
         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 @@ def swapItems(self, x, y, srcIdx):
                 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 @@ def spawnMenu(self):
 
                 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 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 @@
 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 @@
     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 @@ def OnRightClick(self, event):
         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 @@
 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 @@ def reset(self):
         self.Enable(True)
         self.SetValue(self.userSelected)
 
+
 class MarketBrowser(wx.Panel):
     def __init__(self, parent):
         wx.Panel.__init__(self, parent)