Cherry pick commits from @a-tal

eos/db/saveddata/fit.py

@@ -24,12 +24,13 @@ from sqlalchemy.orm.collections import attribute_mapped_collection
 from sqlalchemy.sql import and_
 
 from eos.db import saveddata_meta
+from eos.db import saveddata_session
 from eos.db.saveddata.cargo import cargo_table
 from eos.db.saveddata.drone import drones_table
 from eos.db.saveddata.fighter import fighters_table
 from eos.db.saveddata.implant import fitImplants_table
 from eos.db.saveddata.module import modules_table
-from eos.effectHandlerHelpers import *
+from eos.effectHandlerHelpers import HandledModuleList, HandledImplantBoosterList, HandledProjectedModList, HandledDroneCargoList, HandledProjectedDroneList
 from eos.types import Fit, Module, User, Booster, Drone, Fighter, Cargo, Implant, Character, DamagePattern, \
     TargetResists, ImplantLocation
 
@@ -72,9 +73,9 @@ class ProjectedFit(object):
     def init(self):
         if self.source_fit.isInvalid:
             # Very rare for this to happen, but be prepared for it
-            eos.db.saveddata_session.delete(self.source_fit)
-            eos.db.saveddata_session.flush()
-            eos.db.saveddata_session.refresh(self.victim_fit)
+            saveddata_session.delete(self.source_fit)
+            saveddata_session.flush()
+            saveddata_session.refresh(self.victim_fit)
 
     # We have a series of setters and getters here just in case someone
     # downgrades and screws up the table with NULL values
@@ -101,9 +102,9 @@ class CommandFit(object):
     def init(self):
         if self.booster_fit.isInvalid:
             # Very rare for this to happen, but be prepared for it
-            eos.db.saveddata_session.delete(self.booster_fit)
-            eos.db.saveddata_session.flush()
-            eos.db.saveddata_session.refresh(self.boosted_fit)
+            saveddata_session.delete(self.booster_fit)
+            saveddata_session.flush()
+            saveddata_session.refresh(self.boosted_fit)
 
     def __repr__(self):
         return "CommandFit(boosterID={}, boostedID={}, active={}) at {}".format(

gui/mainFrame.py

@@ -72,6 +72,9 @@ from service.settings import HTMLExportSettings
 
 from time import gmtime, strftime
 
+import threading
+import webbrowser
+
 if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)):
     from service.crest import CrestModes
     from gui.crestFittings import CrestFittings, ExportToEve, CrestMgmt

gui/updateDialog.py

@@ -21,13 +21,14 @@ import wx
 from gui.bitmapLoader import BitmapLoader
 import config
 import dateutil.parser
+from service import settings
 
 class UpdateDialog(wx.Dialog):
 
     def __init__(self, parent, release):
         wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = "Pyfa Update", pos = wx.DefaultPosition, size = wx.Size( 400,300 ), style = wx.DEFAULT_DIALOG_STYLE )
 
-        self.UpdateSettings = service.settings.UpdateSettings.getInstance()
+        self.UpdateSettings = settings.UpdateSettings.getInstance()
         self.releaseInfo = release
         self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize )
 

service/character.py

@@ -37,7 +37,6 @@ from eos.saveddata.implant import Implant as es_Implant
 from eos.saveddata.character import Character as es_Character
 from eos.saveddata.module import Slot as es_Slot, Module as es_Module
 from eos.saveddata.fighter import Fighter as es_Fighter
-from service.fit import Fit as es_Fit
 
 logger = logging.getLogger(__name__)
 
@@ -92,9 +91,6 @@ class SkillBackupThread(threading.Thread):
     def run(self):
         path = self.path
         sCharacter = Character.getInstance()
-        sFit = es_Fit.getInstance()
-        fit = sFit.getFit(self.activeFit)
-        backupData = ""
         if self.saveFmt == "xml" or self.saveFmt == "emp":
             backupData = sCharacter.exportXml()
         else:

service/fit.py

@@ -46,10 +46,6 @@ from eos.saveddata.character import Character as saveddata_Character
 from service.fleet import Fleet
 from service.settings import SettingsProvider
 
-
-# TODO: port this to port.py
-#from service.port import Port
-
 logger = logging.getLogger(__name__)