Changeset 3111

Timestamp:

06/07/06 23:26:23 (2 years ago)

Author:

adrian

Message:

Changed django.utils.text.smart_split to return strings, not tuples

Files:

• django/trunk/django/utils/text.py (modified) (1 diff)

django/trunk/django/utils/text.py

@@ -112 +112 @@
-smart_split_re = re.compile('("(?:[^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'(?:[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'|[^\\s]+)')
-def smart_split(text):
+    """
+    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.']
+    """
-    for bit in smart_split_re.finditer(text):
-        bit = bit.group(0)
-        if bit[0] == '"':
-(bit[1:-1].replace('\\"', '"').replace('\\\\', '\\'), True)
+'"' + bit[1:-1].replace('\\"', '"').replace('\\\\', '\\') + '"'
-        elif bit[0] == "'":
-(bit[1:-1].replace("\\'", "'").replace("\\\\", "\\"), True)
+"'" + bit[1:-1].replace("\\'", "'").replace("\\\\", "\\") + "'"
-        else:
-(bit, False)
+bit