Ticket #7995: url_tag_improvement.diff

django/template/defaulttags.py

@@ -1019 +1019 @@
 
     This is a way to define links that aren't tied to a particular URL
     configuration::
-
+        {% url path.to.some_view arg1 arg2 name1=value1 %}
+    or
         {% url path.to.some_view arg1,arg2,name1=value1 %}
 
     The first argument is a path to a view. It can be an absolute python path
@@ -1044 +1045 @@
 
     The URL will look like ``/clients/client/123/``.
     """
-    bits = token.contents.split(' ', 2)
+    bits = token.split_contents()
     if len(bits) < 2:
         raise TemplateSyntaxError("'%s' takes at least one argument"
                                   " (path to a view)" % bits[0])
     args = []
     kwargs = {}
-    if len(bits) > 2:
-        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))
+    bit_args = []
+    if len(bits) == 3:
+        bit_args = bits[2].split(',')
+    elif len(bits) > 3:
+                bit_args = bits[2:]
+    for arg in bit_args:
+        if '=' in arg:
+            k, v = arg.split('=', 1)
+            k = k.strip()
+            kwargs[k] = parser.compile_filter(v)
+        else:
+            args.append(parser.compile_filter(arg))
     return URLNode(bits[1], args, kwargs)
 url = register.tag(url)