mirror of https://github.com/django/django.git
Negligible changes to django.template -- removed a useless docstring, converted another one to a comment
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
36a06edcdf
commit
55ae4e00a7
|
@ -154,7 +154,6 @@ class StringOrigin(Origin):
|
||||||
|
|
||||||
class Template(object):
|
class Template(object):
|
||||||
def __init__(self, template_string, origin=None, name='<Unknown Template>'):
|
def __init__(self, template_string, origin=None, name='<Unknown Template>'):
|
||||||
"Compilation stage"
|
|
||||||
try:
|
try:
|
||||||
template_string = smart_unicode(template_string)
|
template_string = smart_unicode(template_string)
|
||||||
except UnicodeDecodeError:
|
except UnicodeDecodeError:
|
||||||
|
@ -186,7 +185,7 @@ def compile_string(template_string, origin):
|
||||||
|
|
||||||
class Token(object):
|
class Token(object):
|
||||||
def __init__(self, token_type, contents):
|
def __init__(self, token_type, contents):
|
||||||
"The token_type must be TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK or TOKEN_COMMENT"
|
# token_type must be TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK or TOKEN_COMMENT.
|
||||||
self.token_type, self.contents = token_type, contents
|
self.token_type, self.contents = token_type, contents
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
|
@ -203,7 +202,7 @@ class Lexer(object):
|
||||||
self.origin = origin
|
self.origin = origin
|
||||||
|
|
||||||
def tokenize(self):
|
def tokenize(self):
|
||||||
"Return a list of tokens from a given template_string"
|
"Return a list of tokens from a given template_string."
|
||||||
in_tag = False
|
in_tag = False
|
||||||
result = []
|
result = []
|
||||||
for bit in tag_re.split(self.template_string):
|
for bit in tag_re.split(self.template_string):
|
||||||
|
@ -298,7 +297,7 @@ class Parser(object):
|
||||||
def exit_command(self):
|
def exit_command(self):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def error(self, token, msg ):
|
def error(self, token, msg):
|
||||||
return TemplateSyntaxError(msg)
|
return TemplateSyntaxError(msg)
|
||||||
|
|
||||||
def empty_variable(self, token):
|
def empty_variable(self, token):
|
||||||
|
|
Loading…
Reference in New Issue