From c809a614f90b3961af32580d3a3382f417c74b87 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 30 Apr 2015 19:39:11 +0300 Subject: [PATCH] Revert "Move logging initialization back to pyfa.py" This reverts commit d18cf7b3b0aaa5f92b8eeae5ec555ee6cbc7717d. Reverting all wx3 commits in master --- config.py | 5 +++++ pyfa.py | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config.py b/config.py index ca6cadff1..6b0db1e85 100644 --- a/config.py +++ b/config.py @@ -29,6 +29,11 @@ staticPath = None saveDB = None gameDB = None +# TODO: move back to pyfa.py main loop +# We moved it here just to avoid rebuilding windows skeleton for now (any change to pyfa.py needs it) +import logging +logging.basicConfig() + def defPaths(): global pyfaPath global savePath diff --git a/pyfa.py b/pyfa.py index 460914d2b..2c0c7c00d 100755 --- a/pyfa.py +++ b/pyfa.py @@ -33,7 +33,7 @@ if not hasattr(sys, 'frozen'): except ImportError: print("Cannot find wxPython\nYou can download wxPython (2.8+) from http://www.wxpython.org/") sys.exit(1) - + # if user wants to force 2.8, try that and go directly to ensureMinimal path if fails try: if getattr(config.configforced, "force28", False): @@ -51,7 +51,7 @@ if not hasattr(sys, 'frozen'): print "Installed wxPython version doesn't meet requirements.\nYou can download wxPython (2.8+) from http://www.wxpython.org/" sys.exit(1) else: - print "wxPython 2.8 not found; attempting to use newer version, expect errors" + print "wxPython 2.8 not found; attempting to use newer version, expect errors" try: import sqlalchemy @@ -87,10 +87,6 @@ if __name__ == "__main__": config.saveInRoot = True config.defPaths() - # Basic logging - import logging - logging.basicConfig() - # Import everything import wx import os