Ticket #1176: comment_without_parse_r1831.diff

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:
+                if token.contents == endtag:
+                    return
+        self.unclosed_block_tag([endtag])
+
     def create_variable_node(self, filter_expression):
         return VariableNode(filter_expression)
 

django/core/template/defaulttags.py

@@ -286 +286 @@
     """
     Ignore everything between ``{% comment %}`` and ``{% endcomment %}``
     """
-    nodelist = parser.parse(('endcomment',))
-    parser.delete_first_token()
+    nodelist = parser.skip_past('endcomment')
     return CommentNode()
 comment = register.tag(comment)