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

Revert "Revert "Merge branch 'master' into wx3"". So many reverts.

Browse Source 
This reverts commit cca7f1112a.
This commit is contained in:
blitzmann
2015-06-27 19:46:49 -04:00
parent 6d01877d78
commit 5372f31be8
9 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pyfa.py
View File

@@ -31,7 +31,7 @@ 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
@@ -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