flake8 fixes

eos/db/gamedata/effect.py

@@ -18,8 +18,7 @@
 # ===============================================================================
 
 from sqlalchemy import Column, String, Integer, Boolean, Table, ForeignKey
-from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.orm import mapper, synonym, deferred
-from sqlalchemy.orm import mapper, synonym, relation, deferred
 
 from eos.db import gamedata_meta
 from eos.gamedata import Effect, ItemEffect
@@ -45,4 +44,3 @@ mapper(Effect, effects_table,
        })
 
 mapper(ItemEffect, typeeffects_table)
-

eos/db/gamedata/queries.py

@@ -125,6 +125,7 @@ def getItems(lookfor, eager=None):
     results.sort(key=lambda x: lookfor.index(x.ID))
     return results
 
+
 @cachedQuery(1, "lookfor")
 def getAlphaClone(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -359,6 +360,7 @@ def directAttributeRequest(itemIDs, attrIDs):
     result = gamedata_session.execute(q).fetchall()
     return result
 
+
 def getRequiredFor(itemID, attrMapping):
     Attribute1 = aliased(Attribute)
     Attribute2 = aliased(Attribute)

eos/db/migrations/upgrade23.py

@@ -11,4 +11,3 @@ def upgrade(saveddata_engine):
         saveddata_engine.execute("SELECT secStatus FROM characters LIMIT 1")
     except sqlalchemy.exc.DatabaseError:
         saveddata_engine.execute("ALTER TABLE characters ADD COLUMN secStatus FLOAT;")
-

eos/db/saveddata/fit.py

@@ -250,9 +250,9 @@ mapper(es_Fit, fits_table,
 )
 
 mapper(ProjectedFit, projectedFits_table,
-       properties={
+   properties={
-           "_ProjectedFit__amount": projectedFits_table.c.amount,
+       "_ProjectedFit__amount": projectedFits_table.c.amount,
-       }
+   }
 )
 
 mapper(CommandFit, commandFits_table)

eos/db/saveddata/module.py

@@ -17,7 +17,7 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-from sqlalchemy import Table, Column, Integer, ForeignKey, CheckConstraint, Boolean, DateTime, select
+from sqlalchemy import Table, Column, Integer, ForeignKey, CheckConstraint, Boolean, DateTime
 from sqlalchemy.orm import relation, mapper
 import datetime
 
@@ -40,6 +40,3 @@ modules_table = Table("modules", saveddata_meta,
 
 mapper(Module, modules_table,
        properties={"owner": relation(Fit)})
-
-
-

eos/effects/concordsecstatustankbonus.py

@@ -1,4 +1,6 @@
 type = "passive"
+
+
 def handler(fit, src, context):
 
     # Get pilot sec status bonus directly here, instead of going through the intermediary effects

eos/effects/elitebonuscoveropswarpvelocity1.py

@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Pacifier
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")

eos/effects/elitebonusreconwarpvelocity3.py

@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Enforcer
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")

eos/effects/elitereconstasiswebbonus1.py

@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Enforcer
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")

eos/effects/shipbonusdreadnoughta1energywarfareamountbonus.py

@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Chemosh
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
+                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
+                                  "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")

eos/effects/shipbonusdreadnoughtm1webrangebonus.py

@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Chemosh
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
+                                  "maxRange", src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")

eos/effects/shipbonusforceauxiliarya1nosferatudrainamount.py

@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Dagon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
+                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")

eos/effects/shipbonusforceauxiliarya1nosferaturangebonus.py

@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Dagon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
+                                  "maxRange", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
+                                  "falloffEffectiveness", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")

eos/effects/shipbonusforceauxiliarym1remotearmorrepairduration.py

@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Dagon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"), skill="Minmatar Carrier")

eos/effects/shipbonusmedmissileflighttimecc2.py

@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Enforcer
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
+                                    "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
+                                    "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")

eos/effects/shipbonusrole3capitalenergydamagebonus.py

@@ -4,5 +4,7 @@
 # Ship: Chemosh
 # Ship: Molok
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusRole3"))

eos/effects/shipbonusrole4nosferatucpubonus.py

@@ -4,5 +4,7 @@
 # Ship: Dagon
 # Ship: Rabisu
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "cpu", src.getModifiedItemAttr("shipBonusRole4"))

eos/effects/shipbonusrole5capitalremotearmorrepairpowergridbonus.py

@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Dagon
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "power", src.getModifiedItemAttr("shipBonusRole5"))

eos/effects/shipbonussmallmissileflighttimecf1.py

@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Pacifier
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
+                                    "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
+                                    "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")

eos/effects/shipbonussptrofmf.py

@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Pacifier
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), "speed", src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
+                                  "speed", src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")

eos/effects/shipbonustitana1energywarfareamountbonus.py

@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Molok
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
+                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
+                                  "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")

eos/effects/shipbonustitanm1webrangebonus.py

@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Molok
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
+                                  "maxRange", src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")

eos/effects/shipmoduletrackingdisruptor.py

@@ -5,14 +5,14 @@
 type = "projected", "active"
 
 
-def handler(fit, module, context,  *args, **kwargs):
+def handler(fit, module, context, *args, **kwargs):
     if "projected" in context:
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties=True,  *args, **kwargs)
+                                      stackingPenalties=True, *args, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties=True,  *args, **kwargs)
+                                      stackingPenalties=True, *args, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties=True,  *args, **kwargs)
+                                      stackingPenalties=True, *args, **kwargs)

eos/events.py

@@ -77,10 +77,11 @@ def apply_rel_listeners(target, context):
             listen(rel, 'append', rel_listener)
             listen(rel, 'remove', rel_listener)
 
+
 listen(Fit, 'load', apply_rel_listeners)
 listen(Module, 'load', apply_col_listeners)
 listen(Drone, 'load', apply_col_listeners)
 listen(Fighter, 'load', apply_col_listeners)
 listen(Cargo, 'load', apply_col_listeners)
 listen(Implant, 'load', apply_col_listeners)
-listen(Booster, 'load', apply_col_listeners)
+listen(Booster, 'load', apply_col_listeners)

eos/saveddata/character.py

@@ -359,7 +359,7 @@ class Skill(HandledItem):
                 if item.group.category.ID == 16:  # Skill category
                     if level < rlevel:
                         skill = self.character.getSkill(item.ID)
-                        #print "Removing skill: {}, Dependant level: {}, Required level: {}".format(skill, level, rlevel)
+                        # print "Removing skill: {}, Dependant level: {}, Required level: {}".format(skill, level, rlevel)
                         skill.setLevel(None, persist)
             pyfalog.debug("Strict Skill levels enabled, time to process {}: {}".format(self.item.ID, time.time() - start))
 

eos/saveddata/fit.py

@@ -186,7 +186,7 @@ class Fit(object):
     @property
     def modifiedCoalesce(self):
         """
-        This is a property that should get whichever date is available for the fit. @todo: migrate old timestamp data 
+        This is a property that should get whichever date is available for the fit. @todo: migrate old timestamp data
         and ensure created / modified are set in database to get rid of this
         """
         return self.modified or self.created or datetime.datetime.fromtimestamp(self.timestamp)

gui/itemStats.py

@@ -812,7 +812,7 @@ class ItemDependants(wx.Panel):
                 else:
                     itemIcon = -1
 
-                grand = self.reqTree.AppendItem(child, "{}".format(item.name), itemIcon)
+                self.reqTree.AppendItem(child, "{}".format(item.name), itemIcon)
 
 
 class ItemEffects(wx.Panel):

gui/mainFrame.py

@@ -20,7 +20,6 @@
 import sys
 import os.path
 from logbook import Logger
-import datetime
 
 import sqlalchemy
 # noinspection PyPackageRequirements

gui/shipBrowser.py

@@ -424,7 +424,7 @@ class NavigationPanel(SFItem.SFBrowserItem):
     def OnResize(self, event):
         self.Refresh()
 
-    def ToggleRecentShips(self, bool = None, emitEvent = True):
+    def ToggleRecentShips(self, bool=None, emitEvent=True):
         # this is so janky. Need to revaluate pretty much entire ship browser. >.<
         toggle = bool if bool is not None else not self.shipBrowser.recentFits
 
@@ -958,7 +958,7 @@ class ShipBrowser(wx.Panel):
 
     def importStage(self, event):
         """
-        The import stage handles both displaying fits after importing as well as displaying recent fits. todo: need to 
+        The import stage handles both displaying fits after importing as well as displaying recent fits. todo: need to
         reconcile these two better into a more uniform function, right now hacked together to get working
         """
         self.lpane.ShowLoading(False)
@@ -1946,7 +1946,7 @@ class FitItem(SFItem.SFBrowserItem):
         mdc.SetFont(self.fontNormal)
 
         fitDate = self.timestamp.strftime("%m/%d/%Y %H:%M")
-        fitLocalDate = fitDate #"%d/%02d/%02d %02d:%02d" % (fitDate[0], fitDate[1], fitDate[2], fitDate[3], fitDate[4])
+        fitLocalDate = fitDate  # "%d/%02d/%02d %02d:%02d" % (fitDate[0], fitDate[1], fitDate[2], fitDate[3], fitDate[4])
         pfdate = drawUtils.GetPartialText(mdc, fitLocalDate,
                                           self.toolbarx - self.textStartx - self.padding * 2 - self.thoverw)
 

pyfa.py

@@ -24,7 +24,6 @@ import platform
 import re
 import sys
 import traceback
-from imp import find_module
 from optparse import AmbiguousOptionError, BadOptionError, OptionParser
 
 from logbook import CRITICAL, DEBUG, ERROR, FingersCrossedHandler, INFO, Logger, NestedSetup, NullHandler, StreamHandler, TimedRotatingFileHandler, WARNING, \
@@ -359,6 +358,7 @@ if __name__ == "__main__":
         if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)):
             try:
                 import requests
+                config.requestsVersion = requests.__version
             except ImportError:
                 raise PreCheckException("Cannot import requests. You can download requests from https://pypi.python.org/pypi/requests.")
 

service/character.py

@@ -158,7 +158,7 @@ class Character(object):
                     data += u"Skills required for {}:\n".format(item)
                 data += u"{}{}: {}\n".format("    " * s["indent"], s["skill"], int(s["level"]))
             data += u"-" * 79 + "\n"
-        except Exception, e:
+        except Exception:
             pass
 
         return data

tox.ini

@@ -13,4 +13,4 @@ commands = py.test -vv --cov Pyfa tests/
 [testenv:pep8]
 deps = flake8
 # TODO: Remove E731 and convert lambdas to defs
-commands = flake8 --exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,venv,tests,.tox,build,dist,__init__.py --ignore=E121,E126,E127,E128,E203,E731 service gui eos utils config.py pyfa.py --max-line-length=165
+commands = flake8 --exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,venv,tests,.tox,build,dist,__init__.py,floatspin.py --ignore=E121,E126,E127,E128,E203,E731 service gui eos utils config.py pyfa.py --max-line-length=165