fixed global_settings.gluon_parent for scripts, thanks Vladyslav
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.00.0 (2012-07-18 18:32:43) dev
|
Version 2.00.0 (2012-07-18 18:46:40) dev
|
||||||
|
|||||||
+13
-1
@@ -80,7 +80,7 @@ from http import HTTP, redirect
|
|||||||
from globals import Request, Response, Session
|
from globals import Request, Response, Session
|
||||||
from compileapp import build_environment, run_models_in, \
|
from compileapp import build_environment, run_models_in, \
|
||||||
run_controller_in, run_view_in
|
run_controller_in, run_view_in
|
||||||
from fileutils import copystream
|
from fileutils import copystream, parse_version
|
||||||
from contenttype import contenttype
|
from contenttype import contenttype
|
||||||
from dal import BaseAdapter
|
from dal import BaseAdapter
|
||||||
from settings import global_settings
|
from settings import global_settings
|
||||||
@@ -99,6 +99,18 @@ requests = 0 # gc timer
|
|||||||
|
|
||||||
# pattern used to validate client address
|
# pattern used to validate client address
|
||||||
regex_client = re.compile('[\w\-:]+(\.[\w\-]+)*\.?') # ## to account for IPV6
|
regex_client = re.compile('[\w\-:]+(\.[\w\-]+)*\.?') # ## to account for IPV6
|
||||||
|
|
||||||
|
try:
|
||||||
|
version_info = open(os.path.join(global_settings.gluon_parent, 'VERSION'), 'r')
|
||||||
|
raw_version_string = version_info.read().strip()
|
||||||
|
version_info.close()
|
||||||
|
global_settings.web2py_version = parse_version(raw_version_string)
|
||||||
|
except:
|
||||||
|
# when VERSION file is not found,
|
||||||
|
# when VERSION file is empty,
|
||||||
|
# when VERSION file is incorrect:
|
||||||
|
global_settings.web2py_version = parse_version()
|
||||||
|
|
||||||
web2py_version = global_settings.web2py_version
|
web2py_version = global_settings.web2py_version
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|||||||
+1
-10
@@ -18,7 +18,7 @@ if not hasattr(os, 'mkdir'):
|
|||||||
if global_settings.db_sessions is not True:
|
if global_settings.db_sessions is not True:
|
||||||
global_settings.db_sessions = set()
|
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
|
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 \
|
hasattr(sys, 'JYTHON_JAR') or \
|
||||||
str(sys.copyright).find('Jython') > 0
|
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)
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user