Ticket #8652: django-multiline-tags-with-no-raw-r8662.diff

django/template/__init__.py

@@ -79 +79 @@
 COMMENT_TAG_END = '#}'
 SINGLE_BRACE_START = '{'
 SINGLE_BRACE_END = '}'
+RAW_TAG_START = '{$'
+RAW_TAG_END = '$}'
 
 ALLOWED_VARIABLE_CHARS = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.'
 
@@ -87 +89 @@
 UNKNOWN_SOURCE="<unknown source>"
 
 # match a variable or block tag and capture the entire tag, including start/end delimiters
-tag_re = re.compile('(%s.*?%s|%s.*?%s|%s.*?%s)' % (re.escape(BLOCK_TAG_START), re.escape(BLOCK_TAG_END),
+tag_re = re.compile('(%s.*?%s|%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)))
+                                          re.escape(COMMENT_TAG_START), re.escape(COMMENT_TAG_END),
+                                          re.escape(RAW_TAG_START), re.escape(RAW_TAG_END)), re.S)
 
 # global dictionary of libraries that have been loaded using get_library
 libraries = {}
@@ -221 +224 @@
         otherwise it should be treated as a literal string.
         """
         if in_tag:
-            if token_string.startswith(VARIABLE_TAG_START):
+            if token_string.startswith(RAW_TAG_START):
+                token = Token(TOKEN_TEXT, token_string[len(RAW_TAG_START):-len(RAW_TAG_END)].strip())
+            elif token_string.startswith(VARIABLE_TAG_START):
                 token = Token(TOKEN_VAR, token_string[len(VARIABLE_TAG_START):-len(VARIABLE_TAG_END)].strip())
             elif token_string.startswith(BLOCK_TAG_START):
                 token = Token(TOKEN_BLOCK, token_string[len(BLOCK_TAG_START):-len(BLOCK_TAG_END)].strip())
@@ -229 +234 @@
                 token = Token(TOKEN_COMMENT, '')
         else:
             token = Token(TOKEN_TEXT, token_string)
+
         return token
 
 class Parser(object):