From a9b2f0624d5f9095747e9c2a8518199375c5e815 Mon Sep 17 00:00:00 2001 From: Marian Sigler Date: Fri, 28 Sep 2012 03:10:09 +0200 Subject: use context_processor to create a default context Before, we did it in templated which a) is not the recommended way, b) does only work when @templated is used and c) didn't work when directly returning response objects. --- app.py | 6 ++++++ utils.py | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app.py b/app.py index 4c93ccf..f06eb0b 100644 --- a/app.py +++ b/app.py @@ -43,6 +43,12 @@ def read_blacklist(): with open(app.config['USERNAME_BLACKLIST_FILE']) as f: app.username_blacklist = f.read().split('\n') +@app.context_processor +def template_default_context(): + return { + 'app': app + } + @app.route('/', methods=['GET', 'POST']) @templated('index.html') diff --git a/utils.py b/utils.py index 2cd30dc..27dfb33 100644 --- a/utils.py +++ b/utils.py @@ -28,11 +28,7 @@ def templated(template=None): if template_name is None: template_name = request.endpoint \ .replace('.', '/') + '.html' - - ctx = { - 'app': current_app, - } - ctx.update(f(*args, **kwargs)) + ctx = f(*args, **kwargs) if ctx is None: ctx = {} elif not isinstance(ctx, dict): -- cgit v1.2.3-1-g7c22