From c46caa19d9e1fb429fd77693abcca2fe668366aa Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Sun, 16 Aug 2015 19:00:00 +0200 Subject: 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. --- base/common/python/pki/key.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'base/common/python/pki/key.py') diff --git a/base/common/python/pki/key.py b/base/common/python/pki/key.py index 7b9a463a0..83883dd31 100644 --- a/base/common/python/pki/key.py +++ b/base/common/python/pki/key.py @@ -28,9 +28,9 @@ from __future__ import absolute_import from __future__ import print_function import base64 import json -import urllib from six import iteritems +from six.moves.urllib.parse import quote # pylint: disable=F0401 import pki import pki.encoder as encoder @@ -509,7 +509,7 @@ class KeyClient(object): if client_key_id is None: raise TypeError("Client Key ID must be specified") - url = self.key_url + '/active/' + urllib.quote(client_key_id) + url = self.key_url + '/active/' + quote(client_key_id) response = self.connection.get(url, headers=self.headers) return KeyInfo.from_json(response.json()) -- cgit