From e5fb90f0175f0257ec29be9f06731e1a431c8ccc Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Wed, 8 Feb 2017 14:22:56 -0800 Subject: [PATCH] Fix commit message. LOTS of fixes for flake8. --- eos/db/migrations/upgrade15.py | 2 -- eos/db/migrations/upgrade17.py | 2 -- eos/db/migrations/upgrade19.py | 2 -- eos/db/saveddata/databaseRepair.py | 3 ++- gui/builtinViewColumns/misc.py | 4 ++-- gui/builtinViews/fittingView.py | 2 +- gui/contextMenu.py | 34 ++++++++++++++++++++++++------ gui/graph.py | 2 +- gui/mainFrame.py | 5 +---- gui/mainMenuBar.py | 1 - gui/preferenceView.py | 9 ++++++-- gui/statsView.py | 12 +++++++++-- gui/viewColumn.py | 16 ++++++++++++-- pyfa.py | 2 +- service/fit.py | 1 - service/prefetch.py | 2 -- service/pycrest/eve.py | 5 ----- tox.ini | 2 +- 18 files changed, 68 insertions(+), 38 deletions(-) diff --git a/eos/db/migrations/upgrade15.py b/eos/db/migrations/upgrade15.py index 13852b035..feb824dad 100644 --- a/eos/db/migrations/upgrade15.py +++ b/eos/db/migrations/upgrade15.py @@ -4,8 +4,6 @@ Migration 15 - Delete projected modules on citadels """ -import sqlalchemy - def upgrade(saveddata_engine): sql = """ diff --git a/eos/db/migrations/upgrade17.py b/eos/db/migrations/upgrade17.py index 1d6a4cff8..90ed6e646 100644 --- a/eos/db/migrations/upgrade17.py +++ b/eos/db/migrations/upgrade17.py @@ -4,8 +4,6 @@ Migration 17 - Moves all fleet boosters to the new schema """ -import sqlalchemy - def upgrade(saveddata_engine): from eos.db import saveddata_session diff --git a/eos/db/migrations/upgrade19.py b/eos/db/migrations/upgrade19.py index 090f07dda..d10836e31 100644 --- a/eos/db/migrations/upgrade19.py +++ b/eos/db/migrations/upgrade19.py @@ -4,8 +4,6 @@ Migration 19 - Deletes broken references to fits from the commandFits table (see GH issue #844) """ -import sqlalchemy - def upgrade(saveddata_engine): from eos.db import saveddata_session diff --git a/eos/db/saveddata/databaseRepair.py b/eos/db/saveddata/databaseRepair.py index 6c32695a6..185f8bed1 100644 --- a/eos/db/saveddata/databaseRepair.py +++ b/eos/db/saveddata/databaseRepair.py @@ -85,7 +85,8 @@ class DatabaseCleanup: logger.error("More than one uniform damage pattern found.") else: uniform_damage_pattern_id = rows[0]['ID'] - update_query = "UPDATE 'fits' SET 'damagePatternID' = {} WHERE damagePatternID NOT IN (SELECT ID FROM damagePatterns) OR damagePatternID IS NULL".format(uniform_damage_pattern_id) + update_query = "UPDATE 'fits' SET 'damagePatternID' = {} " \ + "WHERE damagePatternID NOT IN (SELECT ID FROM damagePatterns) OR damagePatternID IS NULL".format(uniform_damage_pattern_id) update_results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, update_query) logger.error("Database corruption found. Cleaning up %d records.", update_results.rowcount) diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index a5188253d..6540a8fa4 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -504,8 +504,8 @@ class Miscellanea(ViewColumn): for number_of_cycles in {5, 10, 25}: tooltip = "{0}\n{1} charges lasts {2} seconds ({3} cycles)".format( tooltip, - formatAmount(number_of_cycles*cycles, 3, 0, 3), - formatAmount((duration+reload_time)*number_of_cycles, 3, 0, 3), + formatAmount(number_of_cycles * cycles, 3, 0, 3), + formatAmount((duration + reload_time) * number_of_cycles, 3, 0, 3), formatAmount(number_of_cycles, 3, 0, 3) ) text = "{0} / {1}s (+{2}s)".format( diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index fc59fac13..8306dfa8d 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -31,7 +31,7 @@ from gui.builtinViewColumns.state import State from gui.bitmapLoader import BitmapLoader import gui.builtinViews.emptyView from gui.utils.exportHtml import exportHtml -from logging import getLogger, Formatter +from logging import getLogger from service.fit import Fit from service.market import Market diff --git a/gui/contextMenu.py b/gui/contextMenu.py index 0d743ebc8..527535393 100644 --- a/gui/contextMenu.py +++ b/gui/contextMenu.py @@ -58,7 +58,7 @@ class ContextMenu(object): rootMenu.selection = (selection,) if not hasattr(selection, "__iter__") else selection empty = True for i, fullContext in enumerate(fullContexts): - amount = 0 + display_amount = 0 srcContext = fullContext[0] try: itemContext = fullContext[1] @@ -68,7 +68,7 @@ class ContextMenu(object): # loop through registered menus m = menuHandler() if m.display(srcContext, selection): - amount += 1 + display_amount += 1 texts = m.getText(itemContext, selection) if isinstance(texts, basestring): @@ -115,7 +115,7 @@ class ContextMenu(object): empty = False - if amount > 0 and i != len(fullContexts) - 1: + if display_amount > 0 and i != len(fullContexts) - 1: rootMenu.AppendSeparator() debug_end = len(cls._ids) @@ -177,6 +177,28 @@ class ContextMenu(object): return None -from gui.builtinContextMenus import ammoPattern, amount, cargo, changeAffectingSkills, damagePattern, droneRemoveStack, \ - droneSplit, factorReload, fighterAbilities, implantSets, itemRemove, itemStats, marketJump, metaSwap, moduleAmmoPicker, \ - moduleGlobalAmmoPicker, openFit, priceClear, project, shipJump, tacticalMode, targetResists, whProjector +from gui.builtinContextMenus import ( # noqa: E402,F401 + ammoPattern, + amount, + cargo, + changeAffectingSkills, + damagePattern, + droneRemoveStack, + droneSplit, + factorReload, + fighterAbilities, + implantSets, + itemRemove, + itemStats, + marketJump, + metaSwap, + moduleAmmoPicker, + moduleGlobalAmmoPicker, + openFit, + priceClear, + project, + shipJump, + tacticalMode, + targetResists, + whProjector +) diff --git a/gui/graph.py b/gui/graph.py index 00ee58694..9c2739479 100644 --- a/gui/graph.py +++ b/gui/graph.py @@ -35,4 +35,4 @@ class Graph(object): return None -from gui.builtinGraphs import fitDps +from gui.builtinGraphs import fitDps # noqa: E402, F401 diff --git a/gui/mainFrame.py b/gui/mainFrame.py index bb9926dc8..fdaa6e6ba 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -71,9 +71,6 @@ from service.port import Port from service.settings import HTMLExportSettings from time import gmtime, strftime -import logging - -logger = logging.getLogger(__name__) import threading import webbrowser @@ -91,7 +88,7 @@ if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION print("Error loading Attribute Editor: %s.\nAccess to Attribute Editor is disabled." % e.message) disableOverrideEditor = True -logger = logging.getLogger("pyfa.gui.mainFrame") +logger = logging.getLogger(__name__) # dummy panel(no paint no erasebk) diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index 5e28da949..340a66e3a 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -21,7 +21,6 @@ import wx import config from service.character import Character -#import gui.graphFrame import gui.globalEvents as GE from gui.bitmapLoader import BitmapLoader diff --git a/gui/preferenceView.py b/gui/preferenceView.py index 4bff674fc..2f7b34bd8 100644 --- a/gui/preferenceView.py +++ b/gui/preferenceView.py @@ -37,5 +37,10 @@ class PreferenceView(object): return wx.NullBitmap -from gui.builtinPreferenceViews import pyfaCrestPreferences, pyfaGeneralPreferences, \ - pyfaHTMLExportPreferences, pyfaNetworkPreferences, pyfaUpdatePreferences +from gui.builtinPreferenceViews import (# noqa: E402, F401 + pyfaGeneralPreferences, + pyfaNetworkPreferences, + pyfaHTMLExportPreferences, + pyfaCrestPreferences, + pyfaUpdatePreferences +) diff --git a/gui/statsView.py b/gui/statsView.py index 0f9416cae..62993ade0 100644 --- a/gui/statsView.py +++ b/gui/statsView.py @@ -42,5 +42,13 @@ class StatsView(object): raise NotImplementedError() -from gui.builtinStatsViews import capacitorViewFull, firepowerViewFull, miningyieldViewFull, priceViewFull, rechargeViewFull, \ - resistancesViewFull, resourcesViewFull, targetingMiscViewFull +from gui.builtinStatsViews import ( # noqa: E402, F401 + resourcesViewFull, + resistancesViewFull, + firepowerViewFull, + miningyieldViewFull, + capacitorViewFull, + rechargeViewFull, + targetingMiscViewFull, + priceViewFull, +) diff --git a/gui/viewColumn.py b/gui/viewColumn.py index ae3af6e7a..cd13055bb 100644 --- a/gui/viewColumn.py +++ b/gui/viewColumn.py @@ -65,5 +65,17 @@ class ViewColumn(object): raise NotImplementedError() -from gui.builtinViewColumns import abilities, ammo, ammoIcon, attributeDisplay, baseIcon, baseName, capacitorUse, maxRange, \ - misc, price, propertyDisplay, state +from gui.builtinViewColumns import ( # noqa: E402, F401 + abilities, + ammo, + ammoIcon, + attributeDisplay, + baseIcon, + baseName, + capacitorUse, + maxRange, + misc, + price, + propertyDisplay, + state +) diff --git a/pyfa.py b/pyfa.py index 4eb9e0b9d..b27389971 100755 --- a/pyfa.py +++ b/pyfa.py @@ -125,7 +125,7 @@ if __name__ == "__main__": import os.path import eos.db - import service.prefetch + import service.prefetch # noqa: F401 from gui.mainFrame import MainFrame # Make sure the saveddata db exists diff --git a/service/fit.py b/service/fit.py index 5a345c4c7..30ff67960 100644 --- a/service/fit.py +++ b/service/fit.py @@ -34,7 +34,6 @@ from eos.saveddata.module import Module as es_Module, State, Slot from eos.saveddata.fit import Fit as FitType from service.character import Character from service.damagePattern import DamagePattern -from service.market import Market from service.settings import SettingsProvider logger = logging.getLogger(__name__) diff --git a/service/prefetch.py b/service/prefetch.py index 257fe37bc..dda8a319f 100644 --- a/service/prefetch.py +++ b/service/prefetch.py @@ -17,7 +17,6 @@ # along with pyfa. If not, see . # ============================================================================= -import threading import os import config @@ -25,7 +24,6 @@ from eos import db from eos.db import migration from eos.db.saveddata.loadDefaultDatabaseValues import DefaultDatabaseValues from eos.db.saveddata.databaseRepair import DatabaseCleanup -from eos.saveddata.character import Character as es_Character import logging diff --git a/service/pycrest/eve.py b/service/pycrest/eve.py index b4ab03cd6..cd5a82f8c 100644 --- a/service/pycrest/eve.py +++ b/service/pycrest/eve.py @@ -22,11 +22,6 @@ try: except ImportError: # pragma: no cover import cPickle as pickle -try: - from urllib.parse import quote -except ImportError: # pragma: no cover - from urllib import quote - logger = logging.getLogger("pycrest.eve") cache_re = re.compile(r'max-age=([0-9]+)') diff --git a/tox.ini b/tox.ini index dea12ad99..9e9d26985 100644 --- a/tox.ini +++ b/tox.ini @@ -14,4 +14,4 @@ commands = py.test -vv --cov Pyfa tests/ deps = flake8 # TODO: Remove F class exceptions once all imports are fixed # 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=E126,E127,E128,E731,F401,F403,F405 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 --ignore=E126,E127,E128,E731 service gui eos utils config.py pyfa.py --max-line-length=165