Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development

Conflicts:
	eos/db/gamedata/metaData.py
	eos/db/gamedata/queries.py
	eos/db/saveddata/queries.py
	eos/saveddata/fleet.py
	eos/types.py
	eve.db
	gui/builtinContextMenus/amount.py
	gui/builtinViewColumns/ammo.py
	gui/builtinViewColumns/ammoIcon.py
	gui/builtinViewColumns/capacitorUse.py
	service/port.py

service/crest.py

@@ -8,7 +8,7 @@ import time
 
 import eos.db
 from eos.enum import Enum
-from eos.types import CrestChar
+from eos.saveddata.crestchar import CrestChar
 import gui.globalEvents as GE
 from service.settings import CRESTSettings
 from service.server import StoppableHTTPServer, AuthHandler

service/fit.py

@@ -29,9 +29,9 @@ 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.module import Module as es_Module
 from eos.saveddata.ship import Ship as es_Ship
-from eos.types import State, Slot, Fit as FitType
+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

service/market.py

@@ -31,11 +31,9 @@ from service import conversions
 from service.settings import SettingsProvider
 from service.price import Price
 
-# TODO: Convert eos.types over to eos.gamedata
-# from eos.gamedata import Category as e_Category, Group as e_Group, Item as e_Item
-
-from eos.types import MarketGroup as types_MarketGroup, MetaGroup as types_MetaGroup, MetaType as types_MetaType, \
-    Category as types_Category, Item as types_Item, Group as types_Group, Price as types_Price
+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 eos.saveddata.price import Price as types_Price
 
 try:
     from collections import OrderedDict

service/port.py

@@ -34,9 +34,17 @@ from eos import db
 from service.fit import Fit as svcFit
 
 import wx
-from service.market import Market
 
-from eos.types import State, Slot, Module, Cargo, Ship, Drone, Implant, Booster, Citadel, Fighter, Fit
+from eos.saveddata.cargo import Cargo
+from eos.saveddata.implant import Implant
+from eos.saveddata.booster import Booster
+from eos.saveddata.drone import Drone
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.module import Module, State, Slot
+from eos.saveddata.ship import Ship
+from eos.saveddata.citadel import Citadel
+from eos.saveddata.fit import Fit
+from service.market import Market
 
 if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)):
     from service.crest import Crest