Fix p3k tests broken in merge

Author: rickhanlonii

oauth2/__init__.py

@@ -40,6 +40,8 @@
 from ._compat import unquote
 from ._compat import unquote_to_bytes
 from ._compat import urlencode
+from ._compat import urlsplit
+from ._compat import urlunsplit
 from ._compat import urlparse
 from ._compat import urlunparse
 from ._version import __version__
@@ -355,12 +357,11 @@ def __init__(self, method=HTTP_METHOD, url=None, parameters=None,
         self.body = body
         self.is_form_encoded = is_form_encoded
 
-
     @setter
     def url(self, value):
         self.__dict__['url'] = value
         if value is not None:
-            scheme, netloc, path, params, query, fragment = urlparse(value)
+            scheme, netloc, path, query, fragment = urlsplit(value)
 
             # Exclude default port numbers.
             if scheme == 'http' and netloc[-3:] == ':80':
@@ -371,7 +372,7 @@ def url(self, value):
                 raise ValueError("Unsupported URL %s (%s)." % (value, scheme))
 
             # Normalized URL excludes params, query, and fragment.
-            self.normalized_url = urlunparse((scheme, netloc, path, None, None, None))
+            self.normalized_url = urlunsplit((scheme, netloc, path, None, None))
         else:
             self.normalized_url = None
             self.__dict__['url'] = None
@@ -416,21 +417,26 @@ def to_postdata(self):
     def to_url(self):
         """Serialize as a URL for a GET request."""
         base_url = urlparse(self.url)
-        try:
-            query = base_url.query
-        except AttributeError: #pragma NO COVER
-            # must be python <2.5
-            query = base_url[4]
-        query = parse_qs(to_utf8(query))
-        for k, v in self.items():
-            query.setdefault(to_utf8(k), []).append(to_utf8_optional_iterator(v))
-        
-        scheme = to_utf8(base_url.scheme)
-        netloc = to_utf8(base_url.netloc)
-        path = to_utf8(base_url.path)
-        params = to_utf8(base_url.params)
-        fragment = to_utf8(base_url.fragment)
-        
+
+        if PY3:
+            query = parse_qs(base_url.query)
+            for k, v in self.items():
+                query.setdefault(k, []).append(to_utf8_optional_iterator(v))
+            scheme = base_url.scheme
+            netloc = base_url.netloc
+            path = base_url.path
+            params = base_url.params
+            fragment = base_url.fragment
+        else:
+            query = parse_qs(to_utf8(base_url.query))
+            for k, v in self.items():
+                query.setdefault(to_utf8(k), []).append(to_utf8_optional_iterator(v))
+            scheme = to_utf8(base_url.scheme)
+            netloc = to_utf8(base_url.netloc)
+            path = to_utf8(base_url.path)
+            params = to_utf8(base_url.params)
+            fragment = to_utf8(base_url.fragment)
+
         url = (scheme, netloc, path, params, urlencode(query, True), fragment)
         return urlunparse(url)
 

oauth2/_compat.py

@@ -31,6 +31,8 @@ def u(x, encoding='ascii'):
     from urllib.parse import unquote
     from urllib.parse import unquote_to_bytes
     from urllib.parse import urlencode
+    from urllib.parse import urlsplit
+    from urllib.parse import urlunsplit
     from urllib.parse import urlparse
     from urllib.parse import urlunparse
 else: #pragma NO COVER Python2
@@ -39,6 +41,8 @@ def u(x, encoding='ascii'):
     from urllib import quote
     from urllib import unquote
     from urllib import urlencode
+    from urlparse import urlsplit
+    from urlparse import urlunsplit
     from urlparse import urlparse
     from urlparse import urlunparse
     unquote_to_bytes = unquote

tests/test_oauth.py

@@ -215,8 +215,7 @@ def test_get_callback_url(self):
         self.assertEqual(url, '%s%s' % (cb, verifier_str))
 
     def test_to_string(self):
-        string = 'oauth_token_secret=%s&oauth_token=%s' % (self.secret,
-                                                           self.key)
+        string = 'oauth_token=%s&oauth_token_secret=%s' % (self.key, self.secret)
         self.assertEqual(self.token.to_string(), string)
 
         self.token.set_callback('http://www.example.com/my-callback')
@@ -443,10 +442,10 @@ def test_to_url_nonascii(self):
         }
 
         req = oauth.Request("GET", url, params)
-        res = urlparse.urlparse(req.to_url())
+        res = urlparse(req.to_url())
 
         params['nonasciithing'] = params['nonasciithing'].encode('utf-8')
-        exp = urlparse.urlparse("%s?%s" % (url, urllib.urlencode(params)))
+        exp = urlparse("%s?%s" % (url, urlencode(params)))
 
         self.assertEquals(exp.netloc, res.netloc)
         self.assertEquals(exp.path, res.path)
@@ -1016,8 +1015,7 @@ def test_sign_request(self):
         params['oauth_token'] = tok.key
         params['oauth_consumer_key'] = con.key
         req = oauth.Request(method="GET", url=url, parameters=params)
-    
-        # TODO: this changes to b input?
+
         methods = {
             b'DX01TdHws7OninCLK9VztNTH1M4=': oauth.SignatureMethod_HMAC_SHA1(),
             b'con-test-secret&tok-test-secret': oauth.SignatureMethod_PLAINTEXT()