diff options
author | David Lord <davidism@gmail.com> | 2017-07-03 09:40:07 -0700 |
---|---|---|
committer | David Lord <davidism@gmail.com> | 2017-07-03 09:40:07 -0700 |
commit | 1f1f031c2ec7524fd7fb6b3ba264f045704f432d (patch) | |
tree | 898e23c6796953efd48cb337650cf341bdadea4c | |
parent | 896aed2e3a507c4f97f3a189ddad61c41ac20f71 (diff) | |
download | jinja2-1f1f031c2ec7524fd7fb6b3ba264f045704f432d.tar.gz |
remove unnecessary \b from name regex
-rw-r--r-- | jinja2/lexer.py | 12 | ||||
-rw-r--r-- | tests/test_lexnparse.py | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/jinja2/lexer.py b/jinja2/lexer.py index 325b847..6c2b232 100644 --- a/jinja2/lexer.py +++ b/jinja2/lexer.py @@ -15,14 +15,12 @@ :license: BSD, see LICENSE for more details. """ import re -import sys - -from operator import itemgetter from collections import deque +from operator import itemgetter + +from jinja2._compat import implements_iterator, intern, iteritems, text_type from jinja2.exceptions import TemplateSyntaxError from jinja2.utils import LRUCache -from jinja2._compat import iteritems, implements_iterator, text_type, intern - # cache for the lexers. Exists in order to be able to have multiple # environments with the same lexer @@ -39,7 +37,7 @@ integer_re = re.compile(r'\d+') try: compile('föö', '<unknown>', 'eval') except SyntaxError: - name_re = re.compile(r'\b[a-zA-Z_][a-zA-Z0-9_]*\b') + name_re = re.compile(r'[a-zA-Z_][a-zA-Z0-9_]*') check_ident = False else: # for whatever reason these do not exist in 'some' verisons of @@ -48,7 +46,7 @@ else: # 0x1886 MONGOLIAN LETTER ALI GALI THREE BALUDA # 0x2118 SCRIPT CAPITAL P # 0x212e ESTIMATED SYMBOL - name_re = re.compile(r'\b[\w\u1885\u1886\u2118\u212e]+\b') + name_re = re.compile(r'[\w\u1885\u1886\u2118\u212e]+') check_ident = True float_re = re.compile(r'(?<!\.)\d+\.\d+') diff --git a/tests/test_lexnparse.py b/tests/test_lexnparse.py index 13d0883..b819627 100644 --- a/tests/test_lexnparse.py +++ b/tests/test_lexnparse.py @@ -133,10 +133,10 @@ class TestLexer(object): (u'_', True, True), (u'1a', False, False), # special cases in addition to \w - ('\u1885', False, True), - ('\u1886', False, True), - ('\u2118', False, True), - ('\u212e', False, True), + (u'\u1885', False, True), + (u'\u1886', False, True), + (u'\u2118', False, True), + (u'\u212e', False, True), )) def test_name(self, env, name, valid2, valid3): t = u'{{ ' + name + u' }}' |