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 /ipaplatform | |
| 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 'ipaplatform')
| -rw-r--r-- | ipaplatform/redhat/tasks.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ipaplatform/redhat/tasks.py b/ipaplatform/redhat/tasks.py index dd614c906..446e2886e 100644 --- a/ipaplatform/redhat/tasks.py +++ b/ipaplatform/redhat/tasks.py @@ -29,12 +29,12 @@ import os import stat import socket import sys -import urllib import base64 from subprocess import CalledProcessError from nss.error import NSPRError from pyasn1.error import PyAsn1Error +from six.moves import urllib from ipapython.ipa_log_manager import root_logger, log_mgr from ipapython import ipautil @@ -215,11 +215,11 @@ class RedHatTaskNamespace(BaseTaskNamespace): "Failed to decode certificate \"%s\": %s", nickname, e) continue - label = urllib.quote(nickname) - subject = urllib.quote(subject) - issuer = urllib.quote(issuer) - serial_number = urllib.quote(serial_number) - public_key_info = urllib.quote(public_key_info) + label = urllib.parse.quote(nickname) + subject = urllib.parse.quote(subject) + issuer = urllib.parse.quote(issuer) + serial_number = urllib.parse.quote(serial_number) + public_key_info = urllib.parse.quote(public_key_info) cert = base64.b64encode(cert) cert = x509.make_pem(cert) @@ -255,7 +255,7 @@ class RedHatTaskNamespace(BaseTaskNamespace): "Failed to encode extended key usage for \"%s\": %s", nickname, e) continue - value = urllib.quote(ext_key_usage) + value = urllib.parse.quote(ext_key_usage) obj = ("[p11-kit-object-v1]\n" "class: x-certificate-extension\n" "label: \"ExtendedKeyUsage for %(label)s\"\n" |