diff options
Diffstat (limited to 'tests/regressiontests/utils/regex_helper.py')
| -rw-r--r-- | tests/regressiontests/utils/regex_helper.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/regressiontests/utils/regex_helper.py b/tests/regressiontests/utils/regex_helper.py index 8dc712f5b9..41f4a4f85d 100644 --- a/tests/regressiontests/utils/regex_helper.py +++ b/tests/regressiontests/utils/regex_helper.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from django.utils import regex_helper from django.utils import unittest @@ -5,44 +7,44 @@ from django.utils import unittest class NormalizeTests(unittest.TestCase): def test_empty(self): pattern = r"" - expected = [(u'', [])] + expected = [('', [])] result = regex_helper.normalize(pattern) self.assertEqual(result, expected) def test_escape(self): pattern = r"\\\^\$\.\|\?\*\+\(\)\[" - expected = [(u'\\^$.|?*+()[', [])] + expected = [('\\^$.|?*+()[', [])] result = regex_helper.normalize(pattern) self.assertEqual(result, expected) def test_group_positional(self): pattern = r"(.*)-(.+)" - expected = [(u'%(_0)s-%(_1)s', ['_0', '_1'])] + expected = [('%(_0)s-%(_1)s', ['_0', '_1'])] result = regex_helper.normalize(pattern) self.assertEqual(result, expected) def test_group_ignored(self): pattern = r"(?i)(?L)(?m)(?s)(?u)(?#)" - expected = [(u'', [])] + expected = [('', [])] result = regex_helper.normalize(pattern) self.assertEqual(result, expected) def test_group_noncapturing(self): pattern = r"(?:non-capturing)" - expected = [(u'non-capturing', [])] + expected = [('non-capturing', [])] result = regex_helper.normalize(pattern) self.assertEqual(result, expected) def test_group_named(self): pattern = r"(?P<first_group_name>.*)-(?P<second_group_name>.*)" - expected = [(u'%(first_group_name)s-%(second_group_name)s', + expected = [('%(first_group_name)s-%(second_group_name)s', ['first_group_name', 'second_group_name'])] result = regex_helper.normalize(pattern) self.assertEqual(result, expected) def test_group_backreference(self): pattern = r"(?P<first_group_name>.*)-(?P=first_group_name)" - expected = [(u'%(first_group_name)s-%(first_group_name)s', + expected = [('%(first_group_name)s-%(first_group_name)s', ['first_group_name'])] result = regex_helper.normalize(pattern) self.assertEqual(result, expected) |
