From: David Lord Date: Sun, 2 Jul 2017 16:30:41 +0000 (-0700) Subject: fix unicode for py2 X-Git-Tag: 2.10~22^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8b37d4d1bd6a9377bc0dda8d94e10f9c611c91d;p=thirdparty%2Fjinja.git fix unicode for py2 --- diff --git a/tests/test_lexnparse.py b/tests/test_lexnparse.py index be46eecc..fcb6bbf0 100644 --- a/tests/test_lexnparse.py +++ b/tests/test_lexnparse.py @@ -126,22 +126,22 @@ 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), + @pytest.mark.parametrize('name,valid2,valid3', ( + (u'foo', True, True), + (u'föö', False, True), + (u'き', False, True), + (u'_', True, True), + (u'1a', False, False), # special cases in addition to \w - ('\u1885', True), - ('\u1886', True), - ('\u2118', True), - ('\u212e', True), + (u'ᢅ', False, True), # 1885 + (u'ᢆ', False, True), # 1886 + (u'℘', False, True), # 2118 + (u'℮', False, True), # 212e )) - def test_name(self, env, name, valid): - t = '{{ ' + name + ' }}' + def test_name(self, env, name, valid2, valid3): + t = u'{{ ' + name + u' }}' - if valid: + if (valid2 and PY2) or (valid3 and not PY2): # shouldn't raise env.from_string(t) else: