Merge branch 'master' of github.com:joestump/python-oauth2

Author: joestump

oauth2/__init__.py

@@ -420,7 +420,7 @@ def to_url(self):
             query = base_url[4]
         query = parse_qs(query)
         for k, v in self.items():
-            query.setdefault(k, []).append(v)
+            query.setdefault(k, []).append(to_utf8_optional_iterator(v))
 
         try:
             scheme = base_url.scheme
@@ -615,8 +615,7 @@ def _split_url_string(param_str):
 class Client(httplib2.Http):
     """OAuthClient is a worker to attempt to execute a request."""
 
-    def __init__(self, consumer, token=None, cache=None, timeout=None,
-        proxy_info=None):
+    def __init__(self, consumer, token=None, **kwargs):
 
         if consumer is not None and not isinstance(consumer, Consumer):
             raise ValueError("Invalid consumer.")
@@ -628,7 +627,7 @@ def __init__(self, consumer, token=None, cache=None, timeout=None,
         self.token = token
         self.method = SignatureMethod_HMAC_SHA1()
 
-        httplib2.Http.__init__(self, cache=cache, timeout=timeout, proxy_info=proxy_info)
+        super(Client, self).__init__(**kwargs)
 
     def set_signature_method(self, method):
         if not isinstance(method, SignatureMethod):

tests/test_oauth.py

@@ -31,7 +31,6 @@
 import time
 import urllib
 import urlparse
-from types import ListType
 import mock
 import httplib2
 
@@ -42,7 +41,7 @@
     from cgi import parse_qs, parse_qsl
 
 
-sys.path[0:0] = [os.path.join(os.path.dirname(__file__), ".."),]
+sys.path[0:0] = [os.path.join(os.path.dirname(__file__), "..")]
 
 
 class TestError(unittest.TestCase):
@@ -375,6 +374,32 @@ def test_get_nonoauth_parameters(self):
         req = oauth.Request("GET", "http://example.com", params)
         self.assertEquals(other_params, req.get_nonoauth_parameters())
 
+    def test_to_url_works_with_non_ascii_parameters(self):
+
+        oauth_params = {
+            'oauth_consumer': 'asdfasdfasdf'
+        }
+
+        other_params = {
+            u'foo': u'baz',
+            u'bar': u'foo',
+            u'multi': [u'FOO',u'BAR'],
+            u'uni_utf8': u'\xae',
+            u'uni_unicode': u'\u00ae',
+            u'uni_unicode_2': u'åÅøØ',
+        }
+
+        params = oauth_params
+        params.update(other_params)
+
+        req = oauth.Request("GET", "http://example.com", params)
+        self.assertEquals(
+            req.to_url(), 
+            'http://example.com?oauth_consumer=asdfasdfasdf&'
+            'uni_unicode_2=%C3%A5%C3%85%C3%B8%C3%98&'
+            'uni_utf8=%C2%AE&multi=%5B%27FOO%27%2C+%27BAR%27%5D&'
+            'uni_unicode=%C2%AE&bar=foo&foo=baz')
+
     def test_to_header(self):
         realm = "http://sp.example.com/"