summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Reyes <freyes@tty.cl>2012-12-17 10:11:10 -0300
committerMarcel Hellkamp <marc@gsites.de>2013-12-04 10:41:27 +0100
commit88a18f77591e64cefc97c430afdc3ce180a136f0 (patch)
tree1ab0ba4e95ac83ee88cd174be466fdad9ae7c792
parent061c545b148a100ec2cb66a0b35b73099a38e84e (diff)
downloadbottle-88a18f77591e64cefc97c430afdc3ce180a136f0.tar.gz
Expose Jinaj2 globals directive
-rw-r--r--bottle.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bottle.py b/bottle.py
index 415af97..6b0bdeb 100644
--- a/bottle.py
+++ b/bottle.py
@@ -3202,7 +3202,7 @@ class CheetahTemplate(BaseTemplate):
class Jinja2Template(BaseTemplate):
- def prepare(self, filters=None, tests=None, **kwargs):
+ def prepare(self, filters=None, tests=None, globals={}, **kwargs):
from jinja2 import Environment, FunctionLoader
if 'prefix' in kwargs: # TODO: to be removed after a while
raise RuntimeError('The keyword argument `prefix` has been removed. '
@@ -3210,6 +3210,7 @@ class Jinja2Template(BaseTemplate):
self.env = Environment(loader=FunctionLoader(self.loader), **kwargs)
if filters: self.env.filters.update(filters)
if tests: self.env.tests.update(tests)
+ if globals: self.env.globals.update(globals)
if self.source:
self.tpl = self.env.from_string(self.source)
else: