dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 12 Wiki Activity

Merge branch 'master' into wx3

Browse Source 
Conflicts:
	pyfa.py
This commit is contained in:
blitzmann
2015-06-27 19:33:12 -04:00
parent 030f22b66f 646f3afd27
commit 6d01877d78
60 changed files with 671 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pyfa.py
View File

@@ -31,9 +31,9 @@ if not hasattr(sys, 'frozen'):
try:
import wxversion
except ImportError:
print("Cannot find wxPython\nYou can download wxPython (2.8+) from http://www.wxpython.org/")
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):
@@ -48,10 +48,10 @@ if not hasattr(sys, 'frozen'):
try:
wxversion.ensureMinimal('2.8')
except wxversion.VersionError:
print "Installed wxPython version doesn't meet requirements.\nYou can download wxPython (2.8+) from http://www.wxpython.org/"
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