maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Added template tests and made config a true global

Browse source
This commit is contained in:
Armin Ronacher 2012-10-08 07:01:49 +02:00
parent 5e88c8184d
commit f34c028125
5 changed files with 43 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
flask/app.py
View file

@ -645,7 +645,8 @@ class Flask(_PackageBoundObject):
rv = Environment(self, **options)
rv.globals.update(
url_for=url_for,
get_flashed_messages=get_flashed_messages
get_flashed_messages=get_flashed_messages,
config=self.config
)
rv.filters['tojson'] = json.htmlsafe_dumps
return rv
@ -694,9 +695,11 @@ class Flask(_PackageBoundObject):
to add extra variables.
"""
funcs = self.template_context_processors[None]
bp = _request_ctx_stack.top.request.blueprint
if bp is not None and bp in self.template_context_processors:
funcs = chain(funcs, self.template_context_processors[bp])
reqctx = _request_ctx_stack.top
if reqctx is not None:
bp = reqctx.request.blueprint
if bp is not None and bp in self.template_context_processors:
funcs = chain(funcs, self.template_context_processors[bp])
orig_ctx = context.copy()
for func in funcs:
context.update(func())