More import fixes

eos/db/__init__.py

@@ -20,10 +20,7 @@
 import threading
 
 from sqlalchemy import MetaData, create_engine
-from sqlalchemy.orm import sessionmaker, scoped_session
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy import pool
-
+from sqlalchemy.orm import sessionmaker
 
 import migration
 from eos import config

gui/contextMenu.py

@@ -178,6 +178,7 @@ class ContextMenu(object):
         return None
 
 
+# noinspection PyUnresolvedReferences
 from gui.builtinContextMenus import (  # noqa: E402,F401
     ammoPattern,
     amount,

gui/graph.py

@@ -35,4 +35,5 @@ class Graph(object):
         return None
 
 
+# noinspection PyUnresolvedReferences
 from gui.builtinGraphs import fitDps  # noqa: E402, F401

gui/graphFrame.py

@@ -59,6 +59,7 @@ class GraphFrame(wx.Frame):
             from matplotlib.figure import Figure
             enabled = True
         except ImportError:
+            mpl = Canvas = Figure = None
             enabled = False
 
         self.legendFix = False

gui/mainFrame.py

@@ -59,6 +59,7 @@ from gui.graphFrame import GraphFrame
 from gui.copySelectDialog import CopySelectDialog
 from gui.utils.clipboard import toClipboard, fromClipboard
 from gui.updateDialog import UpdateDialog
+# noinspection PyUnresolvedReferences
 from gui.builtinViews import emptyView, entityEditor, fittingView, implantEditor  # noqa: F401
 from gui import graphFrame
 

gui/preferenceView.py

@@ -38,6 +38,7 @@ class PreferenceView(object):
         return wx.NullBitmap
 
 
+# noinspection PyUnresolvedReferences
 from gui.builtinPreferenceViews import (# noqa: E402, F401
     pyfaGeneralPreferences,
     pyfaNetworkPreferences,

gui/statsView.py

@@ -42,6 +42,7 @@ class StatsView(object):
         raise NotImplementedError()
 
 
+# noinspection PyUnresolvedReferences
 from gui.builtinStatsViews import (  # noqa: E402, F401
     resourcesViewFull,
     resistancesViewFull,

gui/viewColumn.py

@@ -66,6 +66,7 @@ class ViewColumn(object):
         raise NotImplementedError()
 
 
+# noinspection PyUnresolvedReferences
 from gui.builtinViewColumns import (  # noqa: E402, F401
     abilities,
     ammo,

pyfa.py

@@ -127,6 +127,7 @@ if __name__ == "__main__":
     import os.path
 
     import eos.db
+    # noinspection PyUnresolvedReferences
     import service.prefetch  # noqa: F401
     from gui.mainFrame import MainFrame
 

setup.py

@@ -22,7 +22,7 @@ excludes = ['Tkinter', 'collections.abc', 'IPython', 'PyQt4', 'PIL', 'nose', 'to
 
 if __name__ == "__main__":
     import sys
-    # noinspection PyPackageRequirements
+    # noinspection PyPackageRequirements,PyUnresolvedReferences
     from cx_Freeze import setup, Executable
     import config