mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-28 16:16:12 +00:00
Code Issues 32 Releases Wiki Activity

Rewrapped TemplateSyntaxError in Jinja2 backend.

Browse Source 
Changed import style to avoid confusion between Django's and Jinja2's
APIs.
This commit is contained in:
Aymeric Augustin
2015-01-10 21:35:09 +01:00
parent 4c413e231c
commit 71b7668b75
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
django/template/backends/jinja2.py
View File

@@ -4,12 +4,11 @@ from __future__ import absolute_import
import sys
from django.conf import settings
from django.template import TemplateDoesNotExist
from django.template import TemplateDoesNotExist, TemplateSyntaxError
from django.utils import six
from django.utils.module_loading import import_string
from jinja2 import (
DebugUndefined, FileSystemLoader, TemplateNotFound, Undefined)
import jinja2
from .base import BaseEngine
from .utils import csrf_input_lazy, csrf_token_lazy
@@ -28,10 +27,10 @@ class Jinja2(BaseEngine):
environment_cls = import_string(environment)
options.setdefault('autoescape', True)
options.setdefault('loader', FileSystemLoader(self.template_dirs))
options.setdefault('loader', jinja2.FileSystemLoader(self.template_dirs))
options.setdefault('auto_reload', settings.DEBUG)
options.setdefault('undefined',
DebugUndefined if settings.DEBUG else Undefined)
jinja2.DebugUndefined if settings.DEBUG else jinja2.Undefined)
self.env = environment_cls(**options)
@@ -41,9 +40,12 @@ class Jinja2(BaseEngine):
def get_template(self, template_name):
try:
return Template(self.env.get_template(template_name))
except TemplateNotFound as exc:
except jinja2.TemplateNotFound as exc:
six.reraise(TemplateDoesNotExist, TemplateDoesNotExist(exc.args),
sys.exc_info()[2])
except jinja2.TemplateSyntaxError as exc:
six.reraise(TemplateSyntaxError, TemplateSyntaxError(exc.args),
sys.exc_info()[2])
class Template(object):