Use six.moves.urllib instead of urllib/urllib2/urlparse

In Python 3, these modules are reorganized.

Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>

3 files changed, 13 insertions, 12 deletions

diff --git a/ipa-client/ipa-install/ipa-client-automount b/ipa-client/ipa-install/ipa-client-automount
index 5e4ab1396..4b93ea321 100755
--- a/ipa-client/ipa-install/ipa-client-automount
+++ b/ipa-client/ipa-install/ipa-client-automount
@@ -25,12 +25,12 @@ from __future__ import print_function
 
 import sys
 import os
-import urlparse
 import time
 import tempfile
 import gssapi
 
 import SSSDConfig
+from six.moves.urllib.parse import urlsplit
 
 from optparse import OptionParser
 from ipalib import api, errors
@@ -396,7 +396,7 @@ def main():
         root_logger.debug('Executing DNS discovery')
         if ret == ipadiscovery.NO_LDAP_SERVER:
             root_logger.debug('Autodiscovery did not find LDAP server')
-            s = urlparse.urlsplit(api.env.xmlrpc_uri)
+            s = urlsplit(api.env.xmlrpc_uri)
             server = [s.netloc]
             root_logger.debug('Setting server to %s' % s.netloc)
         else:
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index ff44fbb9b..fb47c8a9c 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -27,7 +27,6 @@ try:
     import os
     import time
     import socket
-    import urlparse
     import tempfile
     import getpass
     from ConfigParser import RawConfigParser
@@ -38,6 +37,7 @@ try:
 
     import nss.nss as nss
     import SSSDConfig
+    from six.moves.urllib.parse import urlparse, urlunparse
 
     from ipapython.ipa_log_manager import standard_logging_setup, root_logger
     from ipaclient import ipadiscovery
@@ -1877,7 +1877,7 @@ def get_ca_certs_from_file(url):
     '''
 
     try:
-        parsed = urlparse.urlparse(url, 'file')
+        parsed = urlparse(url, 'file')
     except Exception:
         raise errors.FileError(reason="unable to parse file url '%s'" % url)
 
@@ -2014,16 +2014,16 @@ def get_ca_certs(fstore, options, server, basedn, realm):
     ca_file = CACERT + ".new"
 
     def ldap_url():
-        return urlparse.urlunparse(('ldap', ipautil.format_netloc(server),
-                                   '', '', '', ''))
+        return urlunparse(('ldap', ipautil.format_netloc(server),
+                           '', '', '', ''))
 
     def file_url():
-        return urlparse.urlunparse(('file', '', options.ca_cert_file,
-                                   '', '', ''))
+        return urlunparse(('file', '', options.ca_cert_file,
+                           '', '', ''))
 
     def http_url():
-        return urlparse.urlunparse(('http', ipautil.format_netloc(server),
-                                   '/ipa/config/ca.crt', '', '', ''))
+        return urlunparse(('http', ipautil.format_netloc(server),
+                           '/ipa/config/ca.crt', '', '', ''))
 
 
     interactive = not options.unattended
diff --git a/ipa-client/ipaclient/ipa_certupdate.py b/ipa-client/ipaclient/ipa_certupdate.py
index 720bd9a87..dcd9a1fb2 100644
--- a/ipa-client/ipaclient/ipa_certupdate.py
+++ b/ipa-client/ipaclient/ipa_certupdate.py
@@ -20,7 +20,8 @@
 import os
 import tempfile
 import shutil
-import urlparse
+
+from six.moves.urllib.parse import urlsplit
 
 from ipapython import (admintool, ipautil, ipaldap, sysrestore, dogtag,
                        certmonger, certdb)
@@ -51,7 +52,7 @@ class CertUpdate(admintool.AdminTool):
         api.bootstrap(context='cli_installer')
         api.finalize()
 
-        server = urlparse.urlsplit(api.env.jsonrpc_uri).hostname
+        server = urlsplit(api.env.jsonrpc_uri).hostname
         ldap = ipaldap.IPAdmin(server)
 
         tmpdir = tempfile.mkdtemp(prefix="tmp-")