diff options
| author | Christian Heimes <cheimes@redhat.com> | 2018-09-27 07:47:07 +0200 |
|---|---|---|
| committer | Florence Blanc-Renaud <flo@redhat.com> | 2018-10-05 12:06:19 +0200 |
| commit | 15d5e44ee89ce4c0f1f366b0d7150166f1a26844 (patch) | |
| tree | f53780776f6371351256a249f0869ea69786f374 /ipalib/cli.py | |
| parent | 753264069f29e47bf222e50e95a7ec5849a7f6cb (diff) | |
| download | freeipa-15d5e44ee89ce4c0f1f366b0d7150166f1a26844.tar.gz freeipa-15d5e44ee89ce4c0f1f366b0d7150166f1a26844.tar.xz freeipa-15d5e44ee89ce4c0f1f366b0d7150166f1a26844.zip | |
Py3: Replace six.moves imports
Replace six.moves and six.StringIO/BytesIO imports with cannonical
Python 3 packages.
Note: six.moves.input behaves differently than builtin input function.
Therefore I left six.moves.input for now.
See: https://pagure.io/freeipa/issue/7715
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Fraser Tweedale <ftweedal@redhat.com>
Diffstat (limited to 'ipalib/cli.py')
| -rw-r--r-- | ipalib/cli.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py index 07043ef23..a36fb2a8f 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -23,6 +23,7 @@ Functionality for Command Line Interface. from __future__ import print_function import atexit +import builtins import importlib import logging import textwrap @@ -53,9 +54,6 @@ from ipalib.util import ( if six.PY3: unicode = str - import builtins # pylint: disable=import-error -else: - import __builtin__ as builtins # pylint: disable=import-error if six.PY2: reload(sys) # pylint: disable=reload-builtin, undefined-variable |