orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename jinja_env_class

Browse source 
Inspired by #1056
This commit is contained in:
Markus Unterwaditzer 2015-06-06 06:29:24 +02:00
parent 66b4ea91b4
commit d13a1b363e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flask/app.py
View file

@ -160,7 +160,7 @@ class Flask(_PackageBoundObject):
#: The class that is used for the Jinja environment. #: The class that is used for the Jinja environment.
#: #:
#: .. versionadded:: 1.0 #: .. versionadded:: 1.0
jinja_env_class = Environment jinja_environment = Environment
#: The class that is used for the :data:`~flask.g` instance. #: The class that is used for the :data:`~flask.g` instance.
#: #:
@ -685,7 +685,7 @@ class Flask(_PackageBoundObject):
options['auto_reload'] = self.config['TEMPLATES_AUTO_RELOAD'] options['auto_reload'] = self.config['TEMPLATES_AUTO_RELOAD']
else: else:
options['auto_reload'] = self.debug options['auto_reload'] = self.debug
rv = self.jinja_env_class(self, **options) rv = self.jinja_environment(self, **options)
rv.globals.update( rv.globals.update(
url_for=url_for, url_for=url_for,
get_flashed_messages=get_flashed_messages, get_flashed_messages=get_flashed_messages,

2
tests/test_templating.py
View file

@ -367,7 +367,7 @@ def test_custom_jinja_env():
pass pass
class CustomFlask(flask.Flask): class CustomFlask(flask.Flask):
jinja_env_class = CustomEnvironment jinja_environment = CustomEnvironment
app = CustomFlask(__name__) app = CustomFlask(__name__)
assert isinstance(app.jinja_env, CustomEnvironment) assert isinstance(app.jinja_env, CustomEnvironment)