Ticket #1456: url_multi_value_fixed2.patch

turbogears/controllers.py

@@ -513 +513 @@
         else:
             pairs = [(key, value)]
         for (k,v) in pairs:
-            if isinstance(value, unicode):
-                value = value.encode("utf8")
+            if v is None:
+                continue
+            if isinstance(v, unicode):
+                v = v.encode("utf8")
             args.append("%s=%s" % (k, urllib.quote(str(v))))
     if args:
         result += "?" + "&".join(args)

turbogears/tests/test_controllers.py

@@ -584 +584 @@
         assert url("/foo", bar=("asdf","qwer")) in \
                 ["/foo?bar=qwer&bar=asdf", "/foo?bar=asdf&bar=qwer"]
 
+    def test_unicode(self):
+        """url() can handle unicode parameters"""
+        testutil.create_request("/")
+        assert url('/', x=u'\N{LATIN SMALL LETTER A WITH GRAVE}'
+            u'\N{LATIN SMALL LETTER E WITH GRAVE}'
+            u'\N{LATIN SMALL LETTER I WITH GRAVE}'
+            u'\N{LATIN SMALL LETTER O WITH GRAVE}'
+            u'\N{LATIN SMALL LETTER U WITH GRAVE}') \
+            == '/?x=%C3%A0%C3%A8%C3%AC%C3%B2%C3%B9'
+
+    def test_list(self):
+        """url can handle list parameters, with unicode too"""
+        testutil.create_request("/")
+        assert url('/', foo=['bar', u'\N{LATIN SMALL LETTER A WITH GRAVE}']) \
+            == '/?foo=bar&foo=%C3%A0'
+
     def tearDown(self):
         turbogears.config.update({"server.webpath" : ""})
         turbogears.startup.startTurboGears()
 
+
 def test_index_trailing_slash():
     "If there is no trailing slash on an index method call, redirect"
     cherrypy.root = SubApp()