diff options
author | Christian Heimes <cheimes@redhat.com> | 2015-08-16 19:00:00 +0200 |
---|---|---|
committer | Christian Heimes <cheimes@redhat.com> | 2015-08-17 21:14:12 +0200 |
commit | c46caa19d9e1fb429fd77693abcca2fe668366aa (patch) | |
tree | bb5ed5f4c2987959b53c4390783ae67f1d3a16d6 /base/kra/functional | |
parent | 1c7a2735c82d6af1a871efd2c01f942387821a1f (diff) | |
download | pki-c46caa19d9e1fb429fd77693abcca2fe668366aa.tar.gz pki-c46caa19d9e1fb429fd77693abcca2fe668366aa.tar.xz pki-c46caa19d9e1fb429fd77693abcca2fe668366aa.zip |
Py3 modernization: misc manual fixes
Python 3's exception class has no message attribute. e.message can
either be replaced with string representation of e or e.args[0].
Use print(line, end='') instead of sys.stdout.write(). With end='' no
new line is appended.
Use six.reraise() to reraise an exception.
Remove sys.exc_clear() as it is no longer available in Python 3.
Conditionally import shutil.WindowsError.
Use six.move to import correct modules / function like quote, urlparse
and configparser.
Silence some pylint warnings. pylint doesn't understand six.moves magic
and emits a import-error warning.
Add additional tox envs to check for Python 3 compatibility.
Diffstat (limited to 'base/kra/functional')
-rw-r--r-- | base/kra/functional/drmclient_deprecated.py | 4 | ||||
-rwxr-xr-x | base/kra/functional/drmtest.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/base/kra/functional/drmclient_deprecated.py b/base/kra/functional/drmclient_deprecated.py index a5b985fee..e558073f8 100644 --- a/base/kra/functional/drmclient_deprecated.py +++ b/base/kra/functional/drmclient_deprecated.py @@ -38,7 +38,6 @@ from __future__ import absolute_import from __future__ import print_function from lxml import etree import nss.nss as nss -import httplib from ipapython import nsslib, ipautil from nss.error import NSPRError from ipalib.errors import NetworkError, CertificateOperationError @@ -47,6 +46,7 @@ from datetime import datetime import logging import base64 import six +from six.moves import http_client # pylint: disable=F0401 CERT_HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----" CERT_FOOTER = "-----END NEW CERTIFICATE REQUEST-----" @@ -385,7 +385,7 @@ def http_request(host, port, url, operation, args): post = args else: post = "" - conn = httplib.HTTPConnection(host, port) + conn = http_client.HTTPConnection(host, port) try: if operation == "GET": if args is not None: diff --git a/base/kra/functional/drmtest.py b/base/kra/functional/drmtest.py index 27acf4875..dd44c374b 100755 --- a/base/kra/functional/drmtest.py +++ b/base/kra/functional/drmtest.py @@ -43,7 +43,7 @@ import sys import tempfile import time -from six.moves import range # pylint: disable=W0622 +from six.moves import range # pylint: disable=W0622,F0401 import pki import pki.crypto |