Ticket #4171: forbide_newlines_in_tags.diff

__init__.py

@@ -93 +93 @@
                                           re.escape(COMMENT_TAG_START), re.escape(COMMENT_TAG_END)))
 # matches if the string is valid number
 number_re = re.compile(r'[-+]?(\d+|\d*\.\d+)$')
+newline_re = re.compile(r'[\n\r]')
 
 # global dictionary of libraries that have been loaded using get_library
 libraries = {}
@@ -199 +200 @@
 
     def create_token(self,token_string):
         "Convert the given token string into a new Token object and return it"
-        if token_string.startswith(VARIABLE_TAG_START):
+        if newline_re.search(token_string):
+            token = Token(TOKEN_TEXT, token_string)
+        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())