diff options
author | Petr Viktorin <pviktori@redhat.com> | 2016-01-05 13:57:51 +0100 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2016-01-20 11:59:21 +0100 |
commit | 06a678c1592928403d7619e11dc0fdb6828d51f9 (patch) | |
tree | b3bb0deef2afa8a7a9e6c182ab6ad0ee37f08083 /ipalib | |
parent | b2436560dfb4f2d45d3bf4bdfe1b2a05ff98ee38 (diff) | |
download | freeipa-06a678c1592928403d7619e11dc0fdb6828d51f9.tar.gz freeipa-06a678c1592928403d7619e11dc0fdb6828d51f9.tar.xz freeipa-06a678c1592928403d7619e11dc0fdb6828d51f9.zip |
Avoid builtins that were removed in Python 3
- `file` was removed in favor of `open`. Switch to the new spelling.
- `buffer` was removed in favor of a buffer protocol (and memoryview),
and `reload` was moved to importlib.
Both are used in py2-only blocks, so just placate PyLint.
https://fedorahosted.org/freeipa/ticket/5623
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipalib')
-rw-r--r-- | ipalib/cli.py | 2 | ||||
-rw-r--r-- | ipalib/x509.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py index f9839a78e..136e0aeb8 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -40,7 +40,7 @@ if six.PY3: unicode = str if six.PY2: - reload(sys) + reload(sys) # pylint: disable=reload-builtin sys.setdefaultencoding('utf-8') # pylint: disable=no-member from ipalib import frontend diff --git a/ipalib/x509.py b/ipalib/x509.py index 886bf6af6..2d28876de 100644 --- a/ipalib/x509.py +++ b/ipalib/x509.py @@ -130,7 +130,7 @@ def load_certificate(data, datatype=PEM, dbdir=None): initialize_nss_database(dbdir=dbdir) if six.PY2: - return nss.Certificate(buffer(data)) + return nss.Certificate(buffer(data)) # pylint: disable=buffer-builtin else: # In python 3 , `bytes` has the buffer interface return nss.Certificate(data) |