Revert "Move logging initialization back to pyfa.py"

This reverts commit d18cf7b3b0.

Reverting all wx3 commits in master
This commit is contained in:
DarkPhoenix
2015-04-30 19:39:11 +03:00
parent 2c366faa66
commit c809a614f9
2 changed files with 7 additions and 6 deletions

View File

@@ -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

View File

@@ -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