Ticket #3733: text-smart-split.patch

django/utils/text.py

@@ -186 +186 @@
 
 smart_split_re = re.compile('("(?:[^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'(?:[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'|[^\\s]+)')
 def smart_split(text):
-    """
+    r"""
     Generator that splits a string by spaces, leaving quoted phrases together.
     Supports both single and double quotes, and supports escaping quotes with
     backslashes. In the output, strings will keep their initial and trailing
     quote marks.
-    >>> list(smart_split('This is "a person\'s" test.'))
-    ['This', 'is', '"a person\'s"', 'test.']
+    >>> list(smart_split(r'''This is "a person" test.'''))
+    ['This', 'is', '"a person"', 'test.']
+    >>> print list(smart_split(r'''This is "a person's" test.'''))[2]
+    "a person's"
+    >>> print list(smart_split(r'''This is "a person\"s" test.'''))[2]
+    "a person"s"
+    >>> list(smart_split('''"a 'one'''))
+    ['"a', "'one"]
+    >>> print list(smart_split(r'''all friends' tests'''))[1]
+    friends'
     """
+
     for bit in smart_split_re.finditer(text):
         bit = bit.group(0)
-        if bit[0] == '"':
+        if bit[0] == '"' and bit[-1] == '"':
             yield '"' + bit[1:-1].replace('\\"', '"').replace('\\\\', '\\') + '"'
-        elif bit[0] == "'":
+        elif bit[0] == "'" and bit[-1] == "'":
             yield "'" + bit[1:-1].replace("\\'", "'").replace("\\\\", "\\") + "'"
         else:
             yield bit