From 32944f4c9c5babd492cb19afa28ad7bee238ae48 Mon Sep 17 00:00:00 2001
From: Ebag333 <ebagola@gmail.com>
Date: Wed, 8 Feb 2017 22:47:02 -0800
Subject: [PATCH] More import fixes

---
 eos/db/__init__.py    | 5 +----
 gui/contextMenu.py    | 1 +
 gui/graph.py          | 1 +
 gui/graphFrame.py     | 1 +
 gui/mainFrame.py      | 1 +
 gui/preferenceView.py | 1 +
 gui/statsView.py      | 1 +
 gui/viewColumn.py     | 1 +
 pyfa.py               | 1 +
 setup.py              | 2 +-
 10 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/eos/db/__init__.py b/eos/db/__init__.py
index cb6742d19..796799e99 100644
--- a/eos/db/__init__.py
+++ b/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
diff --git a/gui/contextMenu.py b/gui/contextMenu.py
index 376a8b813..dc587be24 100644
--- a/gui/contextMenu.py
+++ b/gui/contextMenu.py
@@ -178,6 +178,7 @@ class ContextMenu(object):
         return None
 
 
+# noinspection PyUnresolvedReferences
 from gui.builtinContextMenus import (  # noqa: E402,F401
     ammoPattern,
     amount,
diff --git a/gui/graph.py b/gui/graph.py
index 9c2739479..a2b2239de 100644
--- a/gui/graph.py
+++ b/gui/graph.py
@@ -35,4 +35,5 @@ class Graph(object):
         return None
 
 
+# noinspection PyUnresolvedReferences
 from gui.builtinGraphs import fitDps  # noqa: E402, F401
diff --git a/gui/graphFrame.py b/gui/graphFrame.py
index 059bd3fa7..df43b2cb5 100644
--- a/gui/graphFrame.py
+++ b/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
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 665b4c603..db5f4b769 100644
--- a/gui/mainFrame.py
+++ b/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
 
diff --git a/gui/preferenceView.py b/gui/preferenceView.py
index 5a9064ae2..1d3b018aa 100644
--- a/gui/preferenceView.py
+++ b/gui/preferenceView.py
@@ -38,6 +38,7 @@ class PreferenceView(object):
         return wx.NullBitmap
 
 
+# noinspection PyUnresolvedReferences
 from gui.builtinPreferenceViews import (# noqa: E402, F401
     pyfaGeneralPreferences,
     pyfaNetworkPreferences,
diff --git a/gui/statsView.py b/gui/statsView.py
index 62993ade0..773063ca4 100644
--- a/gui/statsView.py
+++ b/gui/statsView.py
@@ -42,6 +42,7 @@ class StatsView(object):
         raise NotImplementedError()
 
 
+# noinspection PyUnresolvedReferences
 from gui.builtinStatsViews import (  # noqa: E402, F401
     resourcesViewFull,
     resistancesViewFull,
diff --git a/gui/viewColumn.py b/gui/viewColumn.py
index c047ebece..4777999a7 100644
--- a/gui/viewColumn.py
+++ b/gui/viewColumn.py
@@ -66,6 +66,7 @@ class ViewColumn(object):
         raise NotImplementedError()
 
 
+# noinspection PyUnresolvedReferences
 from gui.builtinViewColumns import (  # noqa: E402, F401
     abilities,
     ammo,
diff --git a/pyfa.py b/pyfa.py
index f5aab70a3..f89677534 100755
--- a/pyfa.py
+++ b/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
 
diff --git a/setup.py b/setup.py
index 35f87fb62..d32b7120e 100644
--- a/setup.py
+++ b/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