diff --git a/flask/app.py b/flask/app.py index 725e1f4c..67b93cf7 100644 --- a/flask/app.py +++ b/flask/app.py @@ -24,11 +24,12 @@ from flask.helpers import _PackageBoundObject, url_for, get_flashed_messages, \ _tojson_filter from flask.wrappers import Request, Response from flask.config import ConfigAttribute, Config -from flask.ctx import _default_template_ctx_processor, _RequestContext +from flask.ctx import _RequestContext from flask.globals import _request_ctx_stack, request from flask.session import Session, _NullSession from flask.module import _ModuleSetupState -from flask.templating import _DispatchingJinjaLoader +from flask.templating import _DispatchingJinjaLoader, \ + _default_template_ctx_processor # a lock used for logger initialization _logger_lock = Lock() @@ -831,4 +832,3 @@ class Flask(_PackageBoundObject): def __call__(self, environ, start_response): """Shortcut for :attr:`wsgi_app`.""" return self.wsgi_app(environ, start_response) - diff --git a/flask/ctx.py b/flask/ctx.py index 1c538ecf..08eb1bf7 100644 --- a/flask/ctx.py +++ b/flask/ctx.py @@ -63,14 +63,3 @@ class _RequestContext(object): if not self.request.environ.get('flask._preserve_context') and \ (tb is None or not self.app.debug): self.pop() - -def _default_template_ctx_processor(): - """Default template context processor. Injects `request`, - `session` and `g`. - """ - reqctx = _request_ctx_stack.top - return dict( - request=reqctx.request, - session=reqctx.session, - g=reqctx.g - ) diff --git a/flask/templating.py b/flask/templating.py index 0bb704c1..3a4217dd 100644 --- a/flask/templating.py +++ b/flask/templating.py @@ -13,6 +13,18 @@ from jinja2 import BaseLoader, FileSystemLoader, TemplateNotFound from flask.globals import _request_ctx_stack +def _default_template_ctx_processor(): + """Default template context processor. Injects `request`, + `session` and `g`. + """ + reqctx = _request_ctx_stack.top + return dict( + request=reqctx.request, + session=reqctx.session, + g=reqctx.g + ) + + class _DispatchingJinjaLoader(BaseLoader): """A loader that looks for templates in the application and all the module folders.