diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-09-14 12:52:29 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-10-07 10:27:20 +0200 |
| commit | 70b37a956c0b7dad52bf14fdb5fed421c01c8f77 (patch) | |
| tree | 76768609fdbca12ccc93b092e14c4fc4ae06459a /ipapython/ipautil.py | |
| parent | 7f1204a42c0fd13602768e24da7af8814cbf97d2 (diff) | |
| download | freeipa-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/ipautil.py')
| -rw-r--r-- | ipapython/ipautil.py | 4 |
1 files changed, 2 insertions, 2 deletions
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') |