mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
py3: use ConfigParser instead of SafeConfigParser
DeprecationWarning: The SafeConfigParser class has been renamed to ConfigParser in Python 3.2. This alias will be removed in future versions. Use ConfigParser directly instead. https://fedorahosted.org/freeipa/ticket/4985 Reviewed-By: Jan Cholasta <jcholast@redhat.com> Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
parent
3b6892783e
commit
2e63ec42d0
@ -31,7 +31,11 @@ import random
|
|||||||
|
|
||||||
import six
|
import six
|
||||||
# pylint: disable=import-error
|
# pylint: disable=import-error
|
||||||
from six.moves.configparser import SafeConfigParser
|
if six.PY3:
|
||||||
|
# The SafeConfigParser class has been renamed to ConfigParser in Py3
|
||||||
|
from configparser import ConfigParser as SafeConfigParser
|
||||||
|
else:
|
||||||
|
from ConfigParser import SafeConfigParser
|
||||||
# pylint: enable=import-error
|
# pylint: enable=import-error
|
||||||
|
|
||||||
from ipaplatform.tasks import tasks
|
from ipaplatform.tasks import tasks
|
||||||
|
@ -41,7 +41,12 @@ import ldap
|
|||||||
import ldapurl
|
import ldapurl
|
||||||
import six
|
import six
|
||||||
# pylint: disable=import-error
|
# pylint: disable=import-error
|
||||||
from six.moves.configparser import SafeConfigParser, NoOptionError
|
if six.PY3:
|
||||||
|
# The SafeConfigParser class has been renamed to ConfigParser in Py3
|
||||||
|
from configparser import ConfigParser as SafeConfigParser
|
||||||
|
else:
|
||||||
|
from ConfigParser import SafeConfigParser
|
||||||
|
from six.moves.configparser import NoOptionError
|
||||||
# pylint: enable=import-error
|
# pylint: enable=import-error
|
||||||
|
|
||||||
from ipalib.install import sysrestore
|
from ipalib.install import sysrestore
|
||||||
|
@ -23,8 +23,13 @@ import tempfile
|
|||||||
import time
|
import time
|
||||||
import pwd
|
import pwd
|
||||||
|
|
||||||
|
import six
|
||||||
# pylint: disable=import-error
|
# pylint: disable=import-error
|
||||||
from six.moves.configparser import SafeConfigParser
|
if six.PY3:
|
||||||
|
# The SafeConfigParser class has been renamed to ConfigParser in Py3
|
||||||
|
from configparser import ConfigParser as SafeConfigParser
|
||||||
|
else:
|
||||||
|
from ConfigParser import SafeConfigParser
|
||||||
# pylint: enable=import-error
|
# pylint: enable=import-error
|
||||||
|
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
|
@ -30,8 +30,13 @@ from optparse import OptionGroup, SUPPRESS_HELP
|
|||||||
# pylint: enable=deprecated-module
|
# pylint: enable=deprecated-module
|
||||||
|
|
||||||
import dns.resolver
|
import dns.resolver
|
||||||
|
import six
|
||||||
# pylint: disable=import-error
|
# pylint: disable=import-error
|
||||||
from six.moves.configparser import SafeConfigParser
|
if six.PY3:
|
||||||
|
# The SafeConfigParser class has been renamed to ConfigParser in Py3
|
||||||
|
from configparser import ConfigParser as SafeConfigParser
|
||||||
|
else:
|
||||||
|
from ConfigParser import SafeConfigParser
|
||||||
# pylint: enable=import-error
|
# pylint: enable=import-error
|
||||||
|
|
||||||
from ipaserver.install import certs, installutils, bindinstance, dsinstance, ca
|
from ipaserver.install import certs, installutils, bindinstance, dsinstance, ca
|
||||||
|
@ -25,8 +25,13 @@ import pwd
|
|||||||
import ldif
|
import ldif
|
||||||
import itertools
|
import itertools
|
||||||
|
|
||||||
|
import six
|
||||||
# pylint: disable=import-error
|
# pylint: disable=import-error
|
||||||
from six.moves.configparser import SafeConfigParser
|
if six.PY3:
|
||||||
|
# The SafeConfigParser class has been renamed to ConfigParser in Py3
|
||||||
|
from configparser import ConfigParser as SafeConfigParser
|
||||||
|
else:
|
||||||
|
from ConfigParser import SafeConfigParser
|
||||||
# pylint: enable=import-error
|
# pylint: enable=import-error
|
||||||
|
|
||||||
from ipaclient.install.client import update_ipa_nssdb
|
from ipaclient.install.client import update_ipa_nssdb
|
||||||
@ -715,7 +720,11 @@ class Restore(admintool.AdminTool):
|
|||||||
self.backup_host = config.get('ipa', 'host')
|
self.backup_host = config.get('ipa', 'host')
|
||||||
self.backup_ipa_version = config.get('ipa', 'ipa_version')
|
self.backup_ipa_version = config.get('ipa', 'ipa_version')
|
||||||
self.backup_version = config.get('ipa', 'version')
|
self.backup_version = config.get('ipa', 'version')
|
||||||
|
# pylint: disable=no-member
|
||||||
|
# we can assume that returned object is string and it has .split()
|
||||||
|
# method
|
||||||
self.backup_services = config.get('ipa', 'services').split(',')
|
self.backup_services = config.get('ipa', 'services').split(',')
|
||||||
|
# pylint: enable=no-member
|
||||||
|
|
||||||
|
|
||||||
def extract_backup(self, keyring=None):
|
def extract_backup(self, keyring=None):
|
||||||
|
@ -16,7 +16,11 @@ import dns.exception
|
|||||||
|
|
||||||
import six
|
import six
|
||||||
# pylint: disable=import-error
|
# pylint: disable=import-error
|
||||||
from six.moves.configparser import SafeConfigParser
|
if six.PY3:
|
||||||
|
# The SafeConfigParser class has been renamed to ConfigParser in Py3
|
||||||
|
from configparser import ConfigParser as SafeConfigParser
|
||||||
|
else:
|
||||||
|
from ConfigParser import SafeConfigParser
|
||||||
# pylint: enable=import-error
|
# pylint: enable=import-error
|
||||||
|
|
||||||
from ipalib import api
|
from ipalib import api
|
||||||
|
Loading…
Reference in New Issue
Block a user