Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #20231 -- Don't use allow_lazy on smart_split

  • Loading branch information...
commit e7b9c11c3f87e235e643c340d38325fbd4257047 1 parent 118faa0
@bmispelon bmispelon authored claudep committed
Showing with 35 additions and 36 deletions.
  1. +0 −1  django/utils/text.py
  2. +35 −35 tests/text/tests.py
View
1  django/utils/text.py
@@ -356,7 +356,6 @@ def smart_split(text):
text = force_text(text)
for bit in smart_split_re.finditer(text):
yield bit.group(0)
-smart_split = allow_lazy(smart_split, six.text_type)
def _replace_entity(match):
text = match.group(1)
View
70 tests/text/tests.py
@@ -2,12 +2,16 @@
from __future__ import unicode_literals
from django.test import TestCase
-from django.utils.encoding import iri_to_uri
+from django.utils.encoding import iri_to_uri, force_text
+from django.utils.functional import lazy
from django.utils.http import (cookie_date, http_date,
urlquote, urlquote_plus, urlunquote, urlunquote_plus)
+from django.utils import six
from django.utils.text import get_text_list, smart_split
from django.utils.translation import override
+lazystr = lazy(force_text, six.text_type)
+
class TextTests(TestCase):
"""
@@ -25,40 +29,36 @@ def test_get_text_list(self):
def test_smart_split(self):
- self.assertEqual(list(smart_split(r'''This is "a person" test.''')),
- ['This', 'is', '"a person"', 'test.'])
-
- self.assertEqual(list(smart_split(r'''This is "a person's" test.'''))[2],
- '"a person\'s"')
-
- self.assertEqual(list(smart_split(r'''This is "a person\"s" test.'''))[2],
- '"a person\\"s"')
-
- self.assertEqual(list(smart_split('''"a 'one''')), ['"a', "'one"])
-
- self.assertEqual(list(smart_split(r'''all friends' tests'''))[1],
- "friends'")
-
- self.assertEqual(list(smart_split('url search_page words="something else"')),
- ['url', 'search_page', 'words="something else"'])
-
- self.assertEqual(list(smart_split("url search_page words='something else'")),
- ['url', 'search_page', "words='something else'"])
-
- self.assertEqual(list(smart_split('url search_page words "something else"')),
- ['url', 'search_page', 'words', '"something else"'])
-
- self.assertEqual(list(smart_split('url search_page words-"something else"')),
- ['url', 'search_page', 'words-"something else"'])
-
- self.assertEqual(list(smart_split('url search_page words=hello')),
- ['url', 'search_page', 'words=hello'])
-
- self.assertEqual(list(smart_split('url search_page words="something else')),
- ['url', 'search_page', 'words="something', 'else'])
-
- self.assertEqual(list(smart_split("cut:','|cut:' '")),
- ["cut:','|cut:' '"])
+ testdata = [
+ ('This is "a person" test.',
+ ['This', 'is', '"a person"', 'test.']),
+ ('This is "a person\'s" test.',
+ ['This', 'is', '"a person\'s"', 'test.']),
+ ('This is "a person\\"s" test.',
+ ['This', 'is', '"a person\\"s"', 'test.']),
+ ('"a \'one',
+ ['"a', "'one"]),
+ ('all friends\' tests',
+ ['all', 'friends\'', 'tests']),
+ ('url search_page words="something else"',
+ ['url', 'search_page', 'words="something else"']),
+ ("url search_page words='something else'",
+ ['url', 'search_page', "words='something else'"]),
+ ('url search_page words "something else"',
+ ['url', 'search_page', 'words', '"something else"']),
+ ('url search_page words-"something else"',
+ ['url', 'search_page', 'words-"something else"']),
+ ('url search_page words=hello',
+ ['url', 'search_page', 'words=hello']),
+ ('url search_page words="something else',
+ ['url', 'search_page', 'words="something', 'else']),
+ ("cut:','|cut:' '",
+ ["cut:','|cut:' '"]),
+ (lazystr("a b c d"), # Test for #20231
+ ['a', 'b', 'c', 'd']),
+ ]
+ for test, expected in testdata:
+ self.assertEqual(list(smart_split(test)), expected)
def test_urlquote(self):
self.assertEqual(urlquote('Paris & Orl\xe9ans'),

0 comments on commit e7b9c11

Please sign in to comment.
Something went wrong with that request. Please try again.