Changeset 1964

Timestamp:

01/14/06 18:48:23 (3 years ago)

Author:

adrian

Message:

Fixed #1176 -- Changed {% comment %} template tag not to generate a nodelist, so it's now possible to comment-out broken template tags. Thanks, Kieran Holland

Files:

• django/trunk/django/core/template/defaulttags.py (modified) (1 diff)
• django/trunk/django/core/template/__init__.py (modified) (1 diff)
• django/trunk/tests/othertests/templates.py (modified) (1 diff)

django/trunk/django/core/template/defaulttags.py

@@ -287 +287 @@
-    Ignore everything between ``{% comment %}`` and ``{% endcomment %}``
-    """
-
-
+
-    return CommentNode()
-comment = register.tag(comment)

django/trunk/django/core/template/__init__.py

@@ -311 +311 @@
-            self.unclosed_block_tag(parse_until)
-        return nodelist
+
+    def skip_past(self, endtag):
+        while self.tokens:
+            token = self.next_token()
+            if token.token_type == TOKEN_BLOCK and token.contents == endtag:
+                return
+        self.unclosed_block_tag([endtag])
-
-    def create_variable_node(self, filter_expression):

django/trunk/tests/othertests/templates.py

@@ -144 +144 @@
-    'comment-tag01': ("{% comment %}this is hidden{% endcomment %}hello", {}, "hello"),
-    'comment-tag02': ("{% comment %}this is hidden{% endcomment %}hello{% comment %}foo{% endcomment %}", {}, "hello"),
+
+    # Comment tag can contain invalid stuff.
+    'comment-tag03': ("foo{% comment %} {% if %} {% endcomment %}", {}, "foo"),
+    'comment-tag04': ("foo{% comment %} {% endblock %} {% endcomment %}", {}, "foo"),
+    'comment-tag05': ("foo{% comment %} {% somerandomtag %} {% endcomment %}", {}, "foo"),
-
-    ### FOR TAG ###############################################################