Use six for URL utilities

14 files changed, 29 insertions, 30 deletions

diff --git a/openid/consumer/consumer.py b/openid/consumer/consumer.py
index a190ffc..2d0b1c8 100644
--- a/openid/consumer/consumer.py
+++ b/openid/consumer/consumer.py
@@ -190,9 +190,9 @@ from __future__ import unicode_literals
 
 import copy
 import logging
-from urlparse import parse_qsl, urldefrag, urlparse
 
 import six
+from six.moves.urllib.parse import parse_qsl, urldefrag, urlparse
 
 from openid import cryptutil, fetchers, oidutil, urinorm
 from openid.association import Association, SessionNegotiator, default_negotiator
diff --git a/openid/consumer/discover.py b/openid/consumer/discover.py
index a3ffa59..c3ddb66 100644
--- a/openid/consumer/discover.py
+++ b/openid/consumer/discover.py
@@ -2,10 +2,10 @@
 from __future__ import unicode_literals
 
 import logging
-import urlparse
 
 from lxml.etree import LxmlError
 from lxml.html import document_fromstring
+from six.moves.urllib.parse import urldefrag, urlparse
 
 from openid import fetchers, urinorm
 from openid.message import OPENID1_NS as OPENID_1_0_MESSAGE_NS, OPENID2_NS as OPENID_2_0_MESSAGE_NS
@@ -87,7 +87,7 @@ class OpenIDServiceEndpoint(object):
         if self.claimed_id is None:
             return None
         else:
-            return urlparse.urldefrag(self.claimed_id)[0]
+            return urldefrag(self.claimed_id)[0]
 
     def compatibilityMode(self):
         return self.preferredNamespace() != OPENID_2_0_MESSAGE_NS
@@ -306,7 +306,7 @@ def normalizeURL(url):
     except ValueError as why:
         raise DiscoveryFailure('Normalizing identifier: %s' % (why[0],), None)
     else:
-        return urlparse.urldefrag(normalized)[0]
+        return urldefrag(normalized)[0]
 
 
 def normalizeXRI(xri):
@@ -448,7 +448,7 @@ def discoverNoYadis(uri):
 
 
 def discoverURI(uri):
-    parsed = urlparse.urlparse(uri)
+    parsed = urlparse(uri)
     if parsed[0] and parsed[1]:
         if parsed[0] not in ['http', 'https']:
             raise DiscoveryFailure('URI scheme is not HTTP or HTTPS', None)
diff --git a/openid/message.py b/openid/message.py
index 3e65b18..a55b229 100644
--- a/openid/message.py
+++ b/openid/message.py
@@ -3,11 +3,11 @@
 from __future__ import unicode_literals
 
 import copy
-import urllib
 import warnings
 
 import six
 from lxml import etree as ElementTree
+from six.moves.urllib.parse import urlencode
 
 from openid import kvform, oidutil
 
@@ -394,7 +394,7 @@ class Message(object):
     def toURLEncoded(self):
         """Generate an x-www-urlencoded string"""
         args = sorted(self.toPostArgs().items())
-        return urllib.urlencode(args)
+        return urlencode(args)
 
     def _fixNS(self, namespace):
         """Convert an input value into the internally used values of
diff --git a/openid/oidutil.py b/openid/oidutil.py
index b164165..b5ddf31 100644
--- a/openid/oidutil.py
+++ b/openid/oidutil.py
@@ -9,9 +9,9 @@ from __future__ import unicode_literals
 import binascii
 import logging
 import warnings
-from urllib import urlencode
 
 import six
+from six.moves.urllib.parse import urlencode
 
 __all__ = ['log', 'appendArgs', 'toBase64', 'fromBase64', 'autoSubmitHTML']
 
diff --git a/openid/server/trustroot.py b/openid/server/trustroot.py
index 7c1b801..a555d06 100644
--- a/openid/server/trustroot.py
+++ b/openid/server/trustroot.py
@@ -11,9 +11,9 @@ from __future__ import unicode_literals
 
 import logging
 import re
-from urlparse import urlsplit, urlunsplit
 
 import six
+from six.moves.urllib.parse import urlsplit, urlunsplit
 
 from openid import urinorm
 from openid.oidutil import string_to_text
@@ -27,7 +27,6 @@ __all__ = [
     'verifyReturnTo',
 ]
 
-
 _LOGGER = logging.getLogger(__name__)
 
 ############################################
diff --git a/openid/test/discoverdata.py b/openid/test/discoverdata.py
index 04990c5..379f450 100644
--- a/openid/test/discoverdata.py
+++ b/openid/test/discoverdata.py
@@ -2,7 +2,8 @@
 from __future__ import unicode_literals
 
 import os.path
-import urlparse
+
+from six.moves.urllib.parse import urljoin
 
 from openid.yadis.constants import YADIS_HEADER_NAME
 from openid.yadis.discover import DiscoveryFailure, DiscoveryResult
@@ -105,7 +106,7 @@ def generateSample(test_name, base_url,
 
 
 def generateResult(base_url, input_name, id_name, result_name, success):
-    input_url = urlparse.urljoin(base_url, input_name)
+    input_url = urljoin(base_url, input_name)
 
     # If the name is None then we expect the protocol to fail, which
     # we represent by None
@@ -124,12 +125,12 @@ def generateResult(base_url, input_name, id_name, result_name, success):
     else:
         ctype = None
 
-    id_url = urlparse.urljoin(base_url, id_name)
+    id_url = urljoin(base_url, id_name)
 
     result = DiscoveryResult(input_url)
     result.normalized_uri = id_url
     if success:
-        result.xrds_uri = urlparse.urljoin(base_url, result_name)
+        result.xrds_uri = urljoin(base_url, result_name)
     result.content_type = ctype
     result.response_text = content
     return input_url, result
diff --git a/openid/test/test_consumer.py b/openid/test/test_consumer.py
index 0cd6a62..268a641 100644
--- a/openid/test/test_consumer.py
+++ b/openid/test/test_consumer.py
@@ -2,8 +2,8 @@ from __future__ import unicode_literals
 
 import time
 import unittest
-import urlparse
 
+from six.moves.urllib.parse import parse_qsl, urlparse
 from testfixtures import LogCapture, StringComparison
 
 from openid import association, cryptutil, fetchers, kvform, oidutil
@@ -39,7 +39,7 @@ def mkSuccess(endpoint, q):
 
 def parseQuery(qs):
     q = {}
-    for (k, v) in urlparse.parse_qsl(qs):
+    for (k, v) in parse_qsl(qs):
         assert k not in q
         q[k] = v
     return q
@@ -159,7 +159,7 @@ def _test_success(server_url, user_url, delegate_url, links, immediate=False):
 
         redirect_url = request.redirectURL(trust_root, return_to, immediate)
 
-        parsed = urlparse.urlparse(redirect_url)
+        parsed = urlparse(redirect_url)
         qs = parsed[4]
         q = parseQuery(qs)
         new_return_to = q['openid.return_to']
@@ -174,7 +174,7 @@ def _test_success(server_url, user_url, delegate_url, links, immediate=False):
         assert new_return_to.startswith(return_to)
         assert redirect_url.startswith(server_url)
 
-        parsed = urlparse.urlparse(new_return_to)
+        parsed = urlparse(new_return_to)
         query = parseQuery(parsed[4])
         query.update({
             'openid.mode': 'id_res',
diff --git a/openid/test/test_discover.py b/openid/test/test_discover.py
index 414f7ed..d294d3f 100644
--- a/openid/test/test_discover.py
+++ b/openid/test/test_discover.py
@@ -3,7 +3,8 @@ from __future__ import unicode_literals
 
 import os.path
 import unittest
-from urlparse import urlsplit
+
+from six.moves.urllib.parse import urlsplit
 
 from openid import fetchers, message
 from openid.consumer import discover
diff --git a/openid/test/test_message.py b/openid/test/test_message.py
index 24d33cf..fd97dbf 100644
--- a/openid/test/test_message.py
+++ b/openid/test/test_message.py
@@ -2,11 +2,10 @@
 from __future__ import unicode_literals
 
 import unittest
-import urllib
 import warnings
-from urlparse import parse_qs
 
 from lxml import etree as ElementTree
+from six.moves.urllib.parse import parse_qs, quote
 from testfixtures import ShouldWarn
 
 from openid.extensions import sreg
@@ -435,8 +434,7 @@ class OpenID2MessageTest(unittest.TestCase):
         self.assertEqual(self.msg.toKVForm(), 'error:unit test\nmode:error\nns:%s\n' % OPENID2_NS)
 
     def _test_urlencoded(self, s):
-        expected = ('openid.error=unit+test&openid.mode=error&openid.ns=%s&xey=value' %
-                    urllib.quote(OPENID2_NS, ''))
+        expected = ('openid.error=unit+test&openid.mode=error&openid.ns=%s&xey=value' % quote(OPENID2_NS, ''))
         self.assertEqual(s, expected)
 
     def test_toURLEncoded(self):
diff --git a/openid/test/test_server.py b/openid/test/test_server.py
index 149508a..88c1c02 100644
--- a/openid/test/test_server.py
+++ b/openid/test/test_server.py
@@ -5,9 +5,9 @@ from __future__ import unicode_literals
 import unittest
 import warnings
 from functools import partial
-from urlparse import parse_qs, parse_qsl, urlparse
 
 from mock import sentinel
+from six.moves.urllib.parse import parse_qs, parse_qsl, urlparse
 from testfixtures import LogCapture, ShouldWarn, StringComparison
 
 from openid import association, cryptutil, oidutil
diff --git a/openid/test/test_yadis_discover.py b/openid/test/test_yadis_discover.py
index 8e7add8..eec94c8 100644
--- a/openid/test/test_yadis_discover.py
+++ b/openid/test/test_yadis_discover.py
@@ -8,7 +8,8 @@ from __future__ import unicode_literals
 import re
 import types
 import unittest
-import urlparse
+
+from six.moves.urllib.parse import urlparse
 
 from openid import fetchers
 from openid.yadis.discover import DiscoveryFailure, discover
@@ -50,7 +51,7 @@ class TestFetcher(object):
     def fetch(self, url, headers, body):
         current_url = url
         while True:
-            parsed = urlparse.urlparse(current_url)
+            parsed = urlparse(current_url)
             path = parsed[2][1:]
             try:
                 data = discoverdata.generateSample(path, self.base_url)
diff --git a/openid/urinorm.py b/openid/urinorm.py
index 4e1530e..e8cc60e 100644
--- a/openid/urinorm.py
+++ b/openid/urinorm.py
@@ -2,10 +2,9 @@
 from __future__ import unicode_literals
 
 import string
-from urllib import quote, unquote, urlencode
-from urlparse import parse_qsl, urlsplit, urlunsplit
 
 import six
+from six.moves.urllib.parse import parse_qsl, quote, unquote, urlencode, urlsplit, urlunsplit
 
 from .oidutil import string_to_text
 
diff --git a/openid/yadis/xri.py b/openid/yadis/xri.py
index ea394f1..5856792 100644
--- a/openid/yadis/xri.py
+++ b/openid/yadis/xri.py
@@ -8,9 +8,9 @@ from __future__ import unicode_literals
 
 import re
 import warnings
-from urllib import quote
 
 import six
+from six.moves.urllib.parse import quote
 
 from openid.urinorm import GEN_DELIMS, PERCENT_ENCODING_CHARACTER, SUB_DELIMS
 
diff --git a/openid/yadis/xrires.py b/openid/yadis/xrires.py
index 26bffb3..2bc671f 100644
--- a/openid/yadis/xrires.py
+++ b/openid/yadis/xrires.py
@@ -1,7 +1,7 @@
 """XRI resolution."""
 from __future__ import unicode_literals
 
-from urllib import urlencode
+from six.moves.urllib.parse import urlencode
 
 from openid import fetchers
 from openid.oidutil import string_to_text