Ticket #6271: smart_split.2.diff

django/utils/text.py

@@ -178 +178 @@
-ustring_re = re.compile(u"([\u0080-\uffff])")
-
-def javascript_quote(s, quote_double_quotes=False):
-
-    def fix(match):
-        return r"\u%04x" % ord(match.group(1))
-
@@ -196 +195 @@
-    return str(ustring_re.sub(fix, s))
-javascript_quote = allow_lazy(javascript_quote, unicode)
-
-
+
+
+
-def smart_split(text):
-    """
-    Generator that splits a string by spaces, leaving quoted phrases together.
@@ -205 +206 @@
-    quote marks.
-
-    >>> list(smart_split('This is "a person\'s" test.'))
-
+
+
+
+
+
+
+
+
-    """
-    text = force_unicode(text)
+    contents = []
-    for bit in smart_split_re.finditer(text):
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-smart_split = allow_lazy(smart_split, unicode)
-

tests/regressiontests/utils/tests.py

@@ -4 +4 @@
-
-from unittest import TestCase
-
-
+, text
-
-import timesince
-import datastructures
@@ -15 +15 @@
-    'datastructures': datastructures,
-}
-
-class TestUtilsHtml(TestCase):
-
+class UtilsTestCase(TestCase):
+    
-    def check_output(self, function, value, output=None):
-        """
-        Check that function(value) equals output.  If output is None,
@@ -26 +27 @@
-            output = value
-        self.assertEqual(function(value), output)
-
+    def check_generator_output(self, function, value, output=None):
+        """
+        Check that list(function(value)) equals output.  If output is None,
+        check that list(function(value)) equals value.
+        """
+        if output is None:
+            output = value
+        self.assertEqual(list(function(value)), output)
+
+class TestUtilsText(UtilsTestCase):
+
+    def test_smart_split(self):
+        f = text.smart_split
+        items = (
+            # Double quotes.
+            ('arg1|filter:"1 2"', [u'arg1|filter:"1 2"']),
+            ('arg1 arg2|filter:"1" arg3', [u'arg1', u'arg2|filter:"1"', u'arg3']),
+            ('arg1 arg2|filter:"1 2" arg3', [u'arg1', u'arg2|filter:"1 2"', u'arg3']),
+            ('arg1 arg2|filter:"1  2" arg3', [u'arg1', u'arg2|filter:"1  2"', u'arg3']),
+            ('arg1 arg2|filter:"1\t2" arg3', [u'arg1', u'arg2|filter:"1\t2"', u'arg3']),
+            # With escapes.
+            ('arg1 arg2|filter:"1\\"1" arg3', [u'arg1', u'arg2|filter:"1\\"1"', u'arg3']),
+            ('arg1 arg2|filter:"1\\"\'1" arg3', [u'arg1', u'arg2|filter:"1\\"\'1"', u'arg3']),
+            # Single quotes.
+            ("arg1|filter:'1 2'", [u"arg1|filter:'1 2'"]),
+            ("arg1 arg2|filter:'1' arg3", [u'arg1', u"arg2|filter:'1'", u'arg3']),
+            ("arg1 arg2|filter:'1 2' arg3", [u'arg1', u"arg2|filter:'1 2'", u'arg3']),
+            ("arg1 arg2|filter:'1  2' arg3", [u'arg1', u"arg2|filter:'1  2'", u'arg3']),
+            ("arg1 arg2|filter:'1\t2' arg3", [u'arg1', u"arg2|filter:'1\t2'", u'arg3']),
+            # With escapes.
+            ("arg1 arg2|filter:'1\\'1' arg3", [u'arg1', u"arg2|filter:'1\\'1'", u'arg3']),
+            ("arg1 arg2|filter:'1\\'\"1' arg3", [u'arg1', u"arg2|filter:'1\\'\"1'", u'arg3']),
+            # Mixed quotes and multiple filters.
+            ("""with thelist|filter:'A B'|another:"Y Z" as var""", [u'with', u'thelist|filter:\'A B\'|another:"Y Z"', u'as', u'var']),
+            # With escapes.
+            ("""with thelist|filter:'A\\' B'|another:"Y\\" Z" as var""", [u'with', u'thelist|filter:\'A\\\' B\'|another:"Y\\" Z"', u'as', u'var']),
+        )
+        for value, output in items:
+            self.check_generator_output(f, value, output)
+
+
+class TestUtilsHtml(UtilsTestCase):
+
-    def test_escape(self):
-        f = html.escape
-        items = (
@@ -123 +167 @@
-        for value, output in items:
-            self.check_output(f, value, output)
-
-
-
-
-
-
-
-
-
-
-
+
-
-    def test_luhn(self):
-        f = checksums.luhn