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>
This commit is contained in:
Christian Heimes
2018-09-27 07:47:07 +02:00
committed by Florence Blanc-Renaud
parent 753264069f
commit 15d5e44ee8
31 changed files with 46 additions and 90 deletions

View File

@@ -29,10 +29,8 @@ import tempfile
import time
import traceback
# pylint: disable=import-error
from six.moves.configparser import RawConfigParser
from six.moves.urllib.parse import urlparse, urlunparse
# pylint: enable=import-error
from configparser import RawConfigParser
from urllib.parse import urlparse, urlunparse
from ipalib import api, errors, x509
from ipalib.install import certmonger, certstore, service, sysrestore

View File

@@ -24,9 +24,7 @@ import os
import tempfile
import shutil
# pylint: disable=import-error
from six.moves.urllib.parse import urlsplit
# pylint: enable=import-error
from urllib.parse import urlsplit
from ipalib.install import certmonger, certstore, sysrestore
from ipalib.install.kinit import kinit_keytab