* Fixed url_for to handle lists as keyword args when generating query

  parameters.

--HG--
branch : trunk

3 files changed, 23 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index f36163a..7988462 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@ Routes Changelog
 ========================
 
 -- 1.8 (**tip**)
+* Fixed url_for to handle lists as keyword args when generating query
+  parameters.
 * WARNING: Changed map.resource to not use ';', for actions, but the
   normal '/'. This means that formatted URL's will also now have the format
   come AFTER the action. Ie: /messsages/4.xml;rss -> /messages/4/rss.xml
diff --git a/routes/base.py b/routes/base.py
index 8b892b9..02d07c9 100644
--- a/routes/base.py
+++ b/routes/base.py
@@ -539,9 +539,18 @@ class Route(object):
             if _append_slash and not url.endswith('/'):
                 url += '/'
             url += '?'
-            url += urllib.urlencode([(key, kargs[key]) for key in kargs \
-                                     if key in extras and \
-                                     (key != 'action' or key != 'controller')])
+            fragments = []
+            for key in extras:
+                if key == 'action' or key == 'controller':
+                    continue
+                val = kargs[key]
+                if isinstance(val, (tuple, list)):
+                    for value in val:
+                        fragments.append((key, value))
+                else:
+                    fragments.append((key, val))
+                
+            url += urllib.urlencode(fragments)
         elif _append_slash and not url.endswith('/'):
             url += '/'
         return url
diff --git a/routes/util.py b/routes/util.py
index a9cc740..bcdbd1d 100644
--- a/routes/util.py
+++ b/routes/util.py
@@ -170,9 +170,15 @@ def url_for(*args, **kargs):
                 url += '?'
                 query_args = []
                 for key, val in kargs.iteritems():
-                    query_args.append("%s=%s" % (
-                        urllib.quote_plus(unicode(key).encode(encoding)),
-                        urllib.quote_plus(unicode(val).encode(encoding))))
+                    if isinstance(val, (list, tuple)):
+                        for value in val:
+                            query_args.append("%s=%s" % (
+                                urllib.quote_plus(unicode(key).encode(encoding)),
+                                urllib.quote_plus(unicode(value).encode(encoding))))
+                    else:
+                        query_args.append("%s=%s" % (
+                            urllib.quote_plus(unicode(key).encode(encoding)),
+                            urllib.quote_plus(unicode(val).encode(encoding))))
                 url += '&'.join(query_args)
     if not static:
         route_args = []