diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-04-25 10:29:39 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-04-25 10:29:39 +0000 |
| commit | aa1b182da33c6ea4f79c28abd5cc1b7c1733ce25 (patch) | |
| tree | d0455539673e89200f477c0142d746507137659c | |
| parent | b3e0b59def4b6125f5a946d6a87b9b8997da7826 (diff) | |
Fixed #3543 -- Be a bit more tolerant of spaces following the comma
argument separator in the "url" tag.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/template/defaulttags.py | 1 | ||||
| -rw-r--r-- | tests/regressiontests/templates/tests.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index d997d20077..2deae6d403 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -956,6 +956,7 @@ def url(parser, token): for arg in bits[2].split(','): if '=' in arg: k, v = arg.split('=', 1) + k = k.strip() kwargs[k] = parser.compile_filter(v) else: args.append(parser.compile_filter(arg)) diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py index 93fb1ecb4d..f996f63049 100644 --- a/tests/regressiontests/templates/tests.py +++ b/tests/regressiontests/templates/tests.py @@ -694,7 +694,7 @@ class Templates(unittest.TestCase): ### URL TAG ######################################################## # Successes 'url01' : ('{% url regressiontests.templates.views.client client.id %}', {'client': {'id': 1}}, '/url_tag/client/1/'), - 'url02' : ('{% url regressiontests.templates.views.client_action client.id,action="update" %}', {'client': {'id': 1}}, '/url_tag/client/1/update/'), + 'url02' : ('{% url regressiontests.templates.views.client_action client.id, action="update" %}', {'client': {'id': 1}}, '/url_tag/client/1/update/'), 'url03' : ('{% url regressiontests.templates.views.index %}', {}, '/url_tag/'), 'url04' : ('{% url named-client client.id %}', {'client': {'id': 1}}, '/url_tag/named-client/1/'), |