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>

4 files changed, 8 insertions, 8 deletions

diff --git a/ipapython/config.py b/ipapython/config.py
index 76168f29e..996e761f2 100644
--- a/ipapython/config.py
+++ b/ipapython/config.py
@@ -25,10 +25,10 @@ from dns.exception import DNSException
 from ipapython.dn import DN
 from ipaplatform.paths import paths
 import dns.name
+from six.moves.urllib.parse import urlsplit
 
 import socket
 import re
-import urlparse
 
 class IPAConfigError(Exception):
     def __init__(self, msg=''):
@@ -163,7 +163,7 @@ def __parse_config(discover_server = True):
     if discover_server:
         try:
             s = p.get("global", "xmlrpc_uri")
-            server = urlparse.urlsplit(s)
+            server = urlsplit(s)
             config.default_server.append(server.netloc)
         except:
             pass
diff --git a/ipapython/cookie.py b/ipapython/cookie.py
index ee54efd7b..84de94c9c 100644
--- a/ipapython/cookie.py
+++ b/ipapython/cookie.py
@@ -21,10 +21,10 @@ import re
 import time
 import datetime
 import email.utils
-from urllib2 import urlparse
 from calendar import timegm
 
 import six
+from six.moves.urllib.parse import urlparse
 
 from ipapython.ipa_log_manager import log_mgr
 
@@ -540,7 +540,7 @@ class Cookie(object):
         received from.
         '''
 
-        scheme, domain, path, params, query, fragment = urlparse.urlparse(url)
+        scheme, domain, path, params, query, fragment = urlparse(url)
 
         if self.domain is None:
             self.domain = domain.lower()
@@ -642,7 +642,7 @@ class Cookie(object):
 
         cookie_name = self.key
 
-        url_scheme, url_domain, url_path, url_params, url_query, url_fragment = urlparse.urlparse(url)
+        url_scheme, url_domain, url_path, url_params, url_query, url_fragment = urlparse(url)
 
         cookie_expiration = self.get_expiration()
         if cookie_expiration is not None:
diff --git a/ipapython/dogtag.py b/ipapython/dogtag.py
index 305e10a71..398ee0fc4 100644
--- a/ipapython/dogtag.py
+++ b/ipapython/dogtag.py
@@ -22,10 +22,10 @@ import os
 import httplib
 import xml.dom.minidom
 import ConfigParser
-from urllib import urlencode
 
 import nss.nss as nss
 import six
+from six.moves.urllib.parse import urlencode
 
 from ipalib import api, errors
 from ipalib.errors import NetworkError
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 573e6040c..9e710f955 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -27,7 +27,6 @@ import os, sys, traceback
 import copy
 import stat
 import shutil
-import urllib2
 import socket
 import struct
 from types import *
@@ -45,6 +44,7 @@ from dns import resolver, rdatatype
 from dns.exception import DNSException
 import six
 from six.moves import input
+from six.moves import urllib
 
 from ipapython.ipa_log_manager import *
 from ipapython import ipavalidate
@@ -391,7 +391,7 @@ def nolog_replace(string, nolog):
         if not isinstance(value, six.string_types):
             continue
 
-        quoted = urllib2.quote(value)
+        quoted = urllib.parse.quote(value)
         shquoted = shell_quote(value)
         for nolog_value in (shquoted, value, quoted):
             string = string.replace(nolog_value, 'XXXXXXXX')