Context Navigation

Ticket #14502: 14502-no-customizable-end-tag.patch

File 14502-no-customizable-end-tag.patch, 3.4 KB (added by Aymeric Augustin, 12 years ago)

diff --git a/django/template/base.py b/django/template/base.py
index 9b2404c..87ad6f6 100644

                class Lexer(object):
             # hard-coded the 2s here for performance. And it's not like
             # the TAG_START values are going to change anytime, anyway.
             block_content = token_string[2:-2].strip()
             if self.verbatim and block_content == self.verbatim:
+            if self.verbatim and block_content == 'endverbatim':
                 self.verbatim = False
         if in_tag and not self.verbatim:
             if token_string.startswith(VARIABLE_TAG_START):
                 token = Token(TOKEN_VAR, token_string[2:-2].strip())
             elif token_string.startswith(BLOCK_TAG_START):
+                if block_content.startswith('verbatim'):
+                    bits = block_content.split(' ', 1)
+                    if bits[0] == 'verbatim':
+                        if len(bits) > 1:
+                            self.verbatim = bits[1]
+                        else:
+                            self.verbatim = 'endverbatim'
+                if block_content == 'verbatim':
+                    self.verbatim = True
                 token = Token(TOKEN_BLOCK, block_content)
             elif token_string.startswith(COMMENT_TAG_START):
                 content = ''

diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 3073b41..9fc2522 100644

                def verbatim(parser, token):
         {% verbatim %}
             {% don't process this %}
         {% endverbatim %}
-    You can also specify an alternate closing tag::
-        {% verbatim -- %}
-            ...
-        {% -- %}
     """
+    bits = token.contents.split(' ', 1)
+    if len(bits) > 1:
+        closing_tag = bits[1]
+    else:
+        closing_tag = 'endverbatim'
+    nodelist = parser.parse((closing_tag,))
+    nodelist = parser.parse(('endverbatim',))
     parser.delete_first_token()
     return VerbatimNode(nodelist.render(Context()))

diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index af9004b..95889f4 100644

                Django's syntax. For example::
         {{if dying}}Still alive.{{/if}}
     {% endverbatim %}
-You can also specify an alternate closing tag::
-    {% verbatim finished %}
-        The verbatim tag looks like this:
-        {% verbatim %}{% endverbatim %}
-    {% finished %}
 .. templatetag:: widthratio
 widthratio

diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py
index 957ad2b..ce39d85 100644

                class Templates(unittest.TestCase):
             'verbatim-tag03': ("{% verbatim %}It's the {% verbatim %} tag{% endverbatim %}", {}, "It's the {% verbatim %} tag"),
             'verbatim-tag04': ('{% verbatim %}{% verbatim %}{% endverbatim %}{% endverbatim %}', {}, template.TemplateSyntaxError),
             'verbatim-tag05': ('{% verbatim %}{% endverbatim %}{% verbatim %}{% endverbatim %}', {}, ''),
-            'verbatim-tag06': ("{% verbatim -- %}Don't {% endverbatim %} just yet{% -- %}", {}, "Don't {% endverbatim %} just yet"),
+        }
         return tests