Ticket #4164: template_lexer.diff

__init__.py

@@ -199 +199 @@
 
     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 token_string.startswith(VARIABLE_TAG_START) and token_string.endswith(VARIABLE_TAG_END):
             token = Token(TOKEN_VAR, token_string[len(VARIABLE_TAG_START):-len(VARIABLE_TAG_END)].strip())
-        elif token_string.startswith(BLOCK_TAG_START):
+        elif token_string.startswith(BLOCK_TAG_START) and token_string.endswith(BLOCK_TAG_END):
             token = Token(TOKEN_BLOCK, token_string[len(BLOCK_TAG_START):-len(BLOCK_TAG_END)].strip())
-        elif token_string.startswith(COMMENT_TAG_START):
+        elif token_string.startswith(COMMENT_TAG_START) and token_string.endswith(COMMENT_TAG_END):
             token = Token(TOKEN_COMMENT, '')
         else:
             token = Token(TOKEN_TEXT, token_string)