Bunch of import optimizations

service/fit.py

@@ -18,28 +18,26 @@
 # ===============================================================================
 
 import copy
-from logbook import Logger
-from time import time
 import datetime
+from time import time
+
+import wx
+from logbook import Logger
 
 import eos.db
-from eos.saveddata.booster import Booster as es_Booster
-from eos.saveddata.cargo import Cargo as es_Cargo
 from eos.saveddata.character import Character as saveddata_Character
 from eos.saveddata.citadel import Citadel as es_Citadel
 from eos.saveddata.damagePattern import DamagePattern as es_DamagePattern
 from eos.saveddata.drone import Drone as es_Drone
 from eos.saveddata.fighter import Fighter as es_Fighter
-from eos.saveddata.implant import Implant as es_Implant
-from eos.saveddata.ship import Ship as es_Ship
-from eos.saveddata.module import Module as es_Module, State, Slot, ProjectedMap, ProjectedSystem, LocalMap
 from eos.saveddata.fit import Fit as FitType, ImplantLocation
+from eos.saveddata.module import Module as es_Module, State
+from eos.saveddata.ship import Ship as es_Ship
 from service.character import Character
 from service.damagePattern import DamagePattern
+from service.fitDeprecated import FitDeprecated
 from service.settings import SettingsProvider
 from utils.deprecated import deprecated
-import wx
-from service.fitDeprecated import FitDeprecated
 
 pyfalog = Logger(__name__)
 

service/jargon/jargon.py

@@ -17,9 +17,6 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
-import config
-import pkg_resources
-
 
 class Jargon(object):
     def __init__(self, rawdata: dict):

service/market.py

@@ -17,25 +17,22 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-import re
-import threading
-from logbook import Logger
 import queue
-from itertools import chain
+import threading
+from collections import OrderedDict
 
 # noinspection PyPackageRequirements
 import wx
+from logbook import Logger
 from sqlalchemy.sql import or_
 
 import config
 import eos.db
-from service import conversions
-from service.settings import SettingsProvider
-from service.jargon import JargonLoader
-
 from eos.gamedata import Category as types_Category, Group as types_Group, Item as types_Item, MarketGroup as types_MarketGroup, \
     MetaGroup as types_MetaGroup, MetaType as types_MetaType
-from collections import OrderedDict
+from service import conversions
+from service.jargon import JargonLoader
+from service.settings import SettingsProvider
 
 pyfalog = Logger(__name__)
 

service/marketSources/evemarketdata.py

@@ -18,12 +18,12 @@
 # =============================================================================
 
 import time
-from logbook import Logger
 from xml.dom import minidom
 
-from service.network import Network
-from service.price import Price, VALIDITY, TIMEOUT, TimeoutError
+from logbook import Logger
 
+from service.network import Network
+from service.price import Price, TIMEOUT, VALIDITY
 
 pyfalog = Logger(__name__)
 

service/marketSources/evemarketer.py

@@ -18,12 +18,12 @@
 # =============================================================================
 
 import time
-from logbook import Logger
 from xml.dom import minidom
 
-from service.network import Network
-from service.price import Price, VALIDITY, TIMEOUT, TimeoutError
+from logbook import Logger
 
+from service.network import Network
+from service.price import Price, VALIDITY
 
 pyfalog = Logger(__name__)
 

service/port/efs.py

@@ -1,23 +1,20 @@
-import inspect
-import os
-import platform
-import re
-import sys
-import traceback
 import json
-import eos.db
-
+import json
 from math import log
+
+from logbook import Logger
+
+import eos.db
 from config import version as pyfaVersion
+from eos.db import gamedata_session, getAttributeInfo, getCategory, getGroup
+from eos.effectHandlerHelpers import HandledList
+from eos.enum import Enum
+from eos.gamedata import Attribute, Effect, Group, Item, ItemEffect
+from eos.saveddata.drone import Drone
+from eos.saveddata.module import Hardpoint, Module, Slot, State
 from service.fit import Fit
 from service.market import Market
-from eos.enum import Enum
-from eos.saveddata.module import Hardpoint, Slot, Module, State
-from eos.saveddata.drone import Drone
-from eos.effectHandlerHelpers import HandledList
-from eos.db import gamedata_session, getItemsByCategory, getCategory, getAttributeInfo, getGroup
-from eos.gamedata import Category, Group, Item, Traits, Attribute, Effect, ItemEffect
-from logbook import Logger
+
 pyfalog = Logger(__name__)
 
 

service/prereqsCheck.py

@@ -1,7 +1,6 @@
-import sys
-import inspect
-import re
 import platform
+import re
+import sys
 
 version_block = ''
 

service/price.py

@@ -18,18 +18,17 @@
 # =============================================================================
 
 
-import time
-import threading
 import queue
-from xml.dom import minidom
+import threading
+import time
 
-from logbook import Logger
 import wx
+from logbook import Logger
 
 from eos import db
-from service.network import Network, TimeoutError
 from service.fit import Fit
 from service.market import Market
+from service.network import TimeoutError
 
 pyfalog = Logger(__name__)
 
@@ -235,4 +234,3 @@ class PriceWorkerThread(threading.Thread):
             self.wait[x.typeID].append(callback)
 
 
-from service.marketSources import evemarketer, evemarketdata  # noqa: E402

service/update.py

@@ -17,21 +17,19 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
-import threading
-import json
 import calendar
+import threading
 
-# noinspection PyPackageRequirements
-import wx
 # noinspection PyPackageRequirements
 import dateutil.parser
+# noinspection PyPackageRequirements
+import wx
+from logbook import Logger
+from packaging.version import Version
 
 import config
 from service.network import Network
 from service.settings import UpdateSettings
-from logbook import Logger
-from packaging.version import Version
-
 
 pyfalog = Logger(__name__)