Backed out changeset 6afb554797b6, which added unicode identifier support. This doesn't work in reality under Python 2.6 properly.
--HG--
branch : trunk
diff --git a/jinja2/lexer.py b/jinja2/lexer.py
index f472d4b..d950025 100644
--- a/jinja2/lexer.py
+++ b/jinja2/lexer.py
@@ -31,7 +31,7 @@
string_re = re.compile(r"('([^'\\]*(?:\\.[^'\\]*)*)'"
r'|"([^"\\]*(?:\\.[^"\\]*)*)")(?ms)')
integer_re = re.compile(r'\d+')
-name_re = re.compile(r'\b[^\W\d]\w*\b(?u)')
+name_re = re.compile(r'\b[a-zA-Z_][a-zA-Z0-9_]*\b')
float_re = re.compile(r'\d+\.\d+')
# bind operators to token types
@@ -88,13 +88,6 @@
}
-def _trystr(s):
- try:
- return str(s)
- except UnicodeError:
- return s
-
-
def unescape_string(lineno, filename, s):
r"""Unescape a string. Supported escapes:
\a, \n, \r\, \f, \v, \\, \", \', \0
@@ -102,8 +95,7 @@
\x00, \u0000, \U00000000, \N{...}
"""
try:
- return _trystr(s.encode('ascii', 'backslashreplace')
- .decode('unicode-escape'))
+ return s.encode('ascii', 'backslashreplace').decode('unicode-escape')
except UnicodeError, e:
msg = str(e).split(':')[-1].strip()
raise TemplateSyntaxError(msg, lineno, filename)
@@ -417,13 +409,20 @@
elif token in ('raw_begin', 'raw_end'):
continue
elif token == 'data':
- value = _trystr(value)
+ try:
+ value = str(value)
+ except UnicodeError:
+ pass
elif token == 'keyword':
token = value
elif token == 'name':
- value = _trystr(value)
+ value = str(value)
elif token == 'string':
value = unescape_string(lineno, filename, value[1:-1])
+ try:
+ value = str(value)
+ except UnicodeError:
+ pass
elif token == 'integer':
value = int(value)
elif token == 'float':