dealing with issue of accidentally redefining request/response, thanks Auden RovelleQuartz
This commit is contained in:
+9
-8
@@ -261,7 +261,7 @@ class LoadFactory(object):
|
|||||||
import globals
|
import globals
|
||||||
target = target or 'c' + str(random.random())[2:]
|
target = target or 'c' + str(random.random())[2:]
|
||||||
attr['_id'] = target
|
attr['_id'] = target
|
||||||
request = self.environment['request']
|
request = current.request
|
||||||
if '.' in f:
|
if '.' in f:
|
||||||
f, extension = f.rsplit('.', 1)
|
f, extension = f.rsplit('.', 1)
|
||||||
if url or ajax:
|
if url or ajax:
|
||||||
@@ -532,10 +532,11 @@ def run_models_in(environment):
|
|||||||
It tries pre-compiled models first before compiling them.
|
It tries pre-compiled models first before compiling them.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
folder = environment['request'].folder
|
request = current.request
|
||||||
c = environment['request'].controller
|
folder = request.folder
|
||||||
|
c = request.controller
|
||||||
#f = environment['request'].function
|
#f = environment['request'].function
|
||||||
response = environment['response']
|
response = current.response
|
||||||
|
|
||||||
path = pjoin(folder, 'models')
|
path = pjoin(folder, 'models')
|
||||||
cpath = pjoin(folder, 'compiled')
|
cpath = pjoin(folder, 'compiled')
|
||||||
@@ -577,7 +578,7 @@ def run_controller_in(controller, function, environment):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
# if compiled should run compiled!
|
# if compiled should run compiled!
|
||||||
folder = environment['request'].folder
|
folder = current.request.folder
|
||||||
path = pjoin(folder, 'compiled')
|
path = pjoin(folder, 'compiled')
|
||||||
badc = 'invalid controller (%s/%s)' % (controller, function)
|
badc = 'invalid controller (%s/%s)' % (controller, function)
|
||||||
badf = 'invalid function (%s/%s)' % (controller, function)
|
badf = 'invalid function (%s/%s)' % (controller, function)
|
||||||
@@ -631,7 +632,7 @@ def run_controller_in(controller, function, environment):
|
|||||||
layer = filename + ':' + function
|
layer = filename + ':' + function
|
||||||
code = getcfs(layer, filename, lambda: compile2(code, layer))
|
code = getcfs(layer, filename, lambda: compile2(code, layer))
|
||||||
restricted(code, environment, filename)
|
restricted(code, environment, filename)
|
||||||
response = environment['response']
|
response = current.response
|
||||||
vars = response._vars
|
vars = response._vars
|
||||||
if response.postprocessing:
|
if response.postprocessing:
|
||||||
vars = reduce(lambda vars, p: p(vars), response.postprocessing, vars)
|
vars = reduce(lambda vars, p: p(vars), response.postprocessing, vars)
|
||||||
@@ -649,8 +650,8 @@ def run_view_in(environment):
|
|||||||
or `view/generic.extension`
|
or `view/generic.extension`
|
||||||
It tries the pre-compiled views_controller_function.pyc before compiling it.
|
It tries the pre-compiled views_controller_function.pyc before compiling it.
|
||||||
"""
|
"""
|
||||||
request = environment['request']
|
request = current.request
|
||||||
response = environment['response']
|
response = current.response
|
||||||
view = response.view
|
view = response.view
|
||||||
folder = request.folder
|
folder = request.folder
|
||||||
path = pjoin(folder, 'compiled')
|
path = pjoin(folder, 'compiled')
|
||||||
|
|||||||
Reference in New Issue
Block a user