summaryrefslogtreecommitdiffstats
path: root/ipapython/config.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2015-09-14 12:52:29 +0200
committerJan Cholasta <jcholast@redhat.com>2015-10-07 10:27:20 +0200
commit70b37a956c0b7dad52bf14fdb5fed421c01c8f77 (patch)
tree76768609fdbca12ccc93b092e14c4fc4ae06459a /ipapython/config.py
parent7f1204a42c0fd13602768e24da7af8814cbf97d2 (diff)
downloadfreeipa-70b37a956c0b7dad52bf14fdb5fed421c01c8f77.tar.gz
freeipa-70b37a956c0b7dad52bf14fdb5fed421c01c8f77.tar.xz
freeipa-70b37a956c0b7dad52bf14fdb5fed421c01c8f77.zip
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>
Diffstat (limited to 'ipapython/config.py')
-rw-r--r--ipapython/config.py4
1 files changed, 2 insertions, 2 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