test for new identifier lexer

currently fails on special case unicode

diff --git a/jinja2/lexer.py b/jinja2/lexer.py
index 3d48475a50b96528a8288f69ae43f1984edeb8e8..325b84718a5128011fff4284d7beae82e462483a 100644 (file)
--- a/jinja2/lexer.py
+++ b/jinja2/lexer.py
@@ -574,7 +574,7 @@ class Lexer(object):
                 if check_ident and not value.isidentifier():
                     raise TemplateSyntaxError(
                         'Invalid character in identifier',
-                        line, name, filename)
+                        lineno, name, filename)
             elif token == 'string':
                 # try to unescape string
                 try:

diff --git a/tests/test_lexnparse.py b/tests/test_lexnparse.py
index 20d2c6d1e3e5d6c20586993afbcb45cd86c55510..be46eecc8bc468261dfdea097105e1e320314b01 100644 (file)
--- a/tests/test_lexnparse.py
+++ b/tests/test_lexnparse.py
@@ -126,6 +126,27 @@ class TestLexer(object):
                 result = tmpl.render()
                 assert result == expect, (keep, template, result, expect)
 
+    @pytest.mark.parametrize('name,valid', (
+        ('foo', True),
+        ('föö', True),
+        ('き', True),
+        ('_', True),
+        ('1a', False),
+        # special cases in addition to \w
+        ('\u1885', True),
+        ('\u1886', True),
+        ('\u2118', True),
+        ('\u212e', True),
+    ))
+    def test_name(self, env, name, valid):
+        t = '{{ ' + name + ' }}'
+
+        if valid:
+            # shouldn't raise
+            env.from_string(t)
+        else:
+            pytest.raises(TemplateSyntaxError, env.from_string, t)
+
 
 @pytest.mark.lexnparse
 @pytest.mark.parser