From 73cc17ce722520e84d4cd593666fc6729d259363 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Fri, 10 Feb 2017 11:29:52 -0800 Subject: [PATCH] Clean up some more import statements --- gui/chromeTabs.py | 3 ++- gui/graphFrame.py | 2 +- pyfa.py | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gui/chromeTabs.py b/gui/chromeTabs.py index d4b50b713..3265b8d8a 100644 --- a/gui/chromeTabs.py +++ b/gui/chromeTabs.py @@ -1127,8 +1127,9 @@ class PFTabsContainer(wx.Panel): color = wx.Colour(0, 0, 0) brush = wx.Brush(color) - # noinspection PyPackageRequirements + # noinspection PyPackageRequirements,PyUnresolvedReferences,PyUnresolvedReferences,PyUnresolvedReferences from Carbon.Appearance import kThemeBrushDialogBackgroundActive + # noinspection PyUnresolvedReferences brush.MacSetTheme(kThemeBrushDialogBackgroundActive) else: color = wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DFACE) diff --git a/gui/graphFrame.py b/gui/graphFrame.py index df43b2cb5..8ab26d2c7 100644 --- a/gui/graphFrame.py +++ b/gui/graphFrame.py @@ -59,7 +59,7 @@ class GraphFrame(wx.Frame): from matplotlib.figure import Figure enabled = True except ImportError: - mpl = Canvas = Figure = None + matplotlib = mpl = FigureCanvasWxAgg = Canvas = Figure = None enabled = False self.legendFix = False diff --git a/pyfa.py b/pyfa.py index f89677534..6453d373e 100755 --- a/pyfa.py +++ b/pyfa.py @@ -59,6 +59,7 @@ if not hasattr(sys, 'frozen'): try: import wxversion except ImportError: + wxversion = None print("Cannot find wxPython\nYou can download wxPython (2.8+) from http://www.wxpython.org/") sys.exit(1) @@ -89,6 +90,7 @@ if not hasattr(sys, 'frozen'): print("Unknown sqlalchemy version string format, skipping check") except ImportError: + sqlalchemy = None print("Cannot find sqlalchemy.\nYou can download sqlalchemy (0.6+) from http://www.sqlalchemy.org/") sys.exit(1) @@ -97,6 +99,7 @@ if not hasattr(sys, 'frozen'): # noinspection PyPackageRequirements import dateutil.parser # noqa - Copied import statement from service/update.py except ImportError: + dateutil = None print("Cannot find python-dateutil.\nYou can download python-dateutil from https://pypi.python.org/pypi/python-dateutil") sys.exit(1)