test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made a small optimization to the template lexer. There's no need to calculate the len of VARIABLE_TAG_START, et al, each time we create a token. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2012-01-27 23:46:22 +00:00
parent 1d54e3a956
commit 234b7e3720
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
django/template/base.py
View File

@ -204,22 +204,18 @@ class Lexer(object):
otherwise it should be treated as a literal string. otherwise it should be treated as a literal string.
""" """
if in_tag: if in_tag:
# The [2:-2] ranges below strip off *_TAG_START and *_TAG_END.
# We could do len(BLOCK_TAG_START) to be more "correct", but we've
# hard-coded the 2s here for performance. And it's not like
# the TAG_START values are going to change anytime, anyway.
if token_string.startswith(VARIABLE_TAG_START): if token_string.startswith(VARIABLE_TAG_START):
token = Token(TOKEN_VAR, token = Token(TOKEN_VAR, token_string[2:-2].strip())
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):
token = Token(TOKEN_BLOCK, token = Token(TOKEN_BLOCK, token_string[2:-2].strip())
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):
content = '' content = ''
if token_string.find(TRANSLATOR_COMMENT_MARK): if token_string.find(TRANSLATOR_COMMENT_MARK):
content = token_string[ content = token_string[2:-2].strip()
len(COMMENT_TAG_START):-len(COMMENT_TAG_END)
].strip()
token = Token(TOKEN_COMMENT, content) token = Token(TOKEN_COMMENT, content)
else: else:
token = Token(TOKEN_TEXT, token_string) token = Token(TOKEN_TEXT, token_string)