diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | django/template/base.py | 10 |
2 files changed, 5 insertions, 6 deletions
@@ -356,6 +356,7 @@ answer newbie questions, and generally made Django that much better: Graham Carlyle <graham.carlyle@maplecroft.net> Grant Jenks <contact@grantjenks.com> Greg Chapple <gregchapple1@gmail.com> + Greg Twohig Gregor Allensworth <greg.allensworth@gmail.com> Gregor Müllegger <gregor@muellegger.de> Grigory Fateyev <greg@dial.com.ru> diff --git a/django/template/base.py b/django/template/base.py index a8c2e5774e..c01f36a34e 100644 --- a/django/template/base.py +++ b/django/template/base.py @@ -85,12 +85,10 @@ SINGLE_BRACE_END = '}' # (e.g. strings) UNKNOWN_SOURCE = '<unknown source>' -# match a variable or block tag and capture the entire tag, including start/end -# delimiters -tag_re = (_lazy_re_compile('(%s.*?%s|%s.*?%s|%s.*?%s)' % - (re.escape(BLOCK_TAG_START), re.escape(BLOCK_TAG_END), - re.escape(VARIABLE_TAG_START), re.escape(VARIABLE_TAG_END), - re.escape(COMMENT_TAG_START), re.escape(COMMENT_TAG_END)))) +# Match BLOCK_TAG_*, VARIABLE_TAG_*, and COMMENT_TAG_* tags and capture the +# entire tag, including start/end delimiters. Using re.compile() is faster +# than instantiating SimpleLazyObject with _lazy_re_compile(). +tag_re = re.compile(r'({%.*?%}|{{.*?}}|{#.*?#})') logger = logging.getLogger('django.template') |