Ticket #15093: 15093.diff

django/utils/text.py

@@ -212 +212 @@
 # for single-quoted strings).
 smart_split_re = re.compile(r"""
     ((?:
-        [^\s'"]*
-        (?:
-            (?:"(?:[^"\\]|\\.)*" | '(?:[^'\\]|\\.)*')
-            [^\s'"]*
-        )+
-    ) | \S+)
+        "([^"\\]|\\.)*"  | '([^'\\]|\\.)*'
+    ) | [^"'\s]+)
 """, re.VERBOSE)
 
 def smart_split(text):
@@ -234 +230 @@
     [u'Another', u"'person\\'s'", u'test.']
     >>> list(smart_split(r'A "\"funky\" style" test.'))
     [u'A', u'"\\"funky\\" style"', u'test.']
+    >>> list(smart_split(r' now "j "n" Y"'))
+    [u'now', u'"j "', u'n', u'" Y"']
     """
     text = force_unicode(text)
     for bit in smart_split_re.finditer(text):