p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Malcolm Tredinnick 2007-04-25 10:29:39 +00:00
parent b3e0b59def
commit aa1b182da3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/template/defaulttags.py
View File

@ -956,6 +956,7 @@ def url(parser, token):
for arg in bits[2].split(','): for arg in bits[2].split(','):
if '=' in arg: if '=' in arg:
k, v = arg.split('=', 1) k, v = arg.split('=', 1)
k = k.strip()
kwargs[k] = parser.compile_filter(v) kwargs[k] = parser.compile_filter(v)
else: else:
args.append(parser.compile_filter(arg)) args.append(parser.compile_filter(arg))

2
tests/regressiontests/templates/tests.py
View File

@ -694,7 +694,7 @@ class Templates(unittest.TestCase):
### URL TAG ######################################################## ### URL TAG ########################################################
# Successes # Successes
'url01' : ('{% url regressiontests.templates.views.client client.id %}', {'client': {'id': 1}}, '/url_tag/client/1/'), '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/'), 'url03' : ('{% url regressiontests.templates.views.index %}', {}, '/url_tag/'),
'url04' : ('{% url named-client client.id %}', {'client': {'id': 1}}, '/url_tag/named-client/1/'), 'url04' : ('{% url named-client client.id %}', {'client': {'id': 1}}, '/url_tag/named-client/1/'),