From c858fc2859132a5d2e67ff09b74dadd39afe599f Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Thu, 15 Dec 2016 15:39:19 -0800 Subject: [PATCH] Remove an inline import. Fix a reference that is missing. --- eos/config.py | 2 ++ gui/mainFrame.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/eos/config.py b/eos/config.py index 63bf7695b..01d65cfe0 100644 --- a/eos/config.py +++ b/eos/config.py @@ -4,10 +4,12 @@ from os.path import realpath, join, dirname, abspath debug = False gamedataCache = True saveddataCache = True +gamedata_version = "" gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")), sys.getfilesystemencoding()) saveddata_connectionstring = 'sqlite:///' + unicode( realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding()) + # Autodetect path, only change if the autodetection bugs out. path = dirname(unicode(__file__, sys.getfilesystemencoding())) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index f033fe32f..182bf3480 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -31,6 +31,8 @@ from wx.lib.wordwrap import wordwrap import config +from eos.config import gamedata_version + import gui.aboutData import gui.chromeTabs import gui.globalEvents as GE @@ -346,7 +348,6 @@ class MainFrame(wx.Frame): event.Skip() def ShowAboutBox(self, evt): - import eos.config v = sys.version_info info = wx.AboutDialogInfo() info.Name = "pyfa" @@ -357,7 +358,7 @@ class MainFrame(wx.Frame): "\n\t".join(gui.aboutData.credits) + "\n\nLicenses:\n\t" + "\n\t".join(gui.aboutData.licenses) + - "\n\nEVE Data: \t" + eos.config.gamedata_version + + "\n\nEVE Data: \t" + gamedata_version + "\nPython: \t\t" + '{}.{}.{}'.format(v.major, v.minor, v.micro) + "\nwxPython: \t" + wx.__version__ + "\nSQLAlchemy: \t" + sqlalchemy.__version__,