diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-04-10 04:13:27 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-04-10 04:13:27 +0000 |
| commit | be4a83c4483501102afbfd786100e46ed06cc05c (patch) | |
| tree | e20c7f00c272e4ee29c26edadb6d91daee097725 /django/utils/text.py | |
| parent | f6309cbf8058b77729f9ba96c26accdbb7ae5596 (diff) | |
| download | django-be4a83c4483501102afbfd786100e46ed06cc05c.tar.gz | |
Fixed #9315 -- Handle spaces in URL tag arguments.
Thanks Natalia Bidart and MatÃas Bordese for most of this patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/text.py')
| -rw-r--r-- | django/utils/text.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/django/utils/text.py b/django/utils/text.py index 8bc256e804..fe46e26b52 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -197,7 +197,13 @@ def javascript_quote(s, quote_double_quotes=False): return str(ustring_re.sub(fix, s)) javascript_quote = allow_lazy(javascript_quote, unicode) -smart_split_re = re.compile('("(?:[^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'(?:[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'|[^\\s]+)') +# Expression to match some_token and some_token="with spaces" (and similarly +# for single-quoted strings). +smart_split_re = re.compile(r""" + ([^\s"]*"(?:[^"\\]*(?:\\.[^"\\]*)*)"\S*| + [^\s']*'(?:[^'\\]*(?:\\.[^'\\]*)*)'\S*| + \S+)""", re.VERBOSE) + def smart_split(text): r""" Generator that splits a string by spaces, leaving quoted phrases together. |