fixed global_settings.gluon_parent for scripts, thanks Vladyslav

This commit is contained in:
mdipierro
2012-07-18 18:46:43 -05:00
parent 65bb04d949
commit ad75f7b127
3 changed files with 15 additions and 12 deletions
+1 -10
View File
@@ -18,7 +18,7 @@ if not hasattr(os, 'mkdir'):
if global_settings.db_sessions is not True:
global_settings.db_sessions = set()
global_settings.gluon_parent = os.environ.get('web2py_path', os.getcwd())
global_settings.gluon_parent = os.environ.get('web2py_path', __file__.partition("gluon")[0])
global_settings.applications_parent = global_settings.gluon_parent
@@ -33,12 +33,3 @@ global_settings.is_jython = 'java' in sys.platform.lower() or \
hasattr(sys, 'JYTHON_JAR') or \
str(sys.copyright).find('Jython') > 0
version_info = open(os.path.join(global_settings.gluon_parent, 'VERSION'), 'r')
raw_version_string = version_info.read().strip()
version_info.close()
from fileutils import parse_version # we need fileutils import here, because
# fileutils also imports settings
global_settings.web2py_version = parse_version(raw_version_string)