Use six.moves.configparser instead of ConfigParser

The module name was lowercased in Python 3.

Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>

9 files changed, 18 insertions, 13 deletions

diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py
index 3c36e1b66..6a32bf48a 100644
--- a/ipaserver/install/ca.py
+++ b/ipaserver/install/ca.py
@@ -7,6 +7,8 @@ from __future__ import print_function
 import sys
 import os.path
 
+from six.moves.configparser import RawConfigParser
+
 from ipaserver.install import cainstance, dsinstance, bindinstance
 from ipapython import dogtag, ipautil, certdb
 from ipaplatform import services
@@ -14,7 +16,6 @@ from ipaplatform.paths import paths
 from ipaserver.install import installutils, certs
 from ipaserver.install.replication import replica_conn_check
 from ipalib import api, certstore, x509
-from ConfigParser import RawConfigParser
 from ipapython.dn import DN
 from ipapython.ipa_log_manager import root_logger
 
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index 7a3d46fd5..dd24fd845 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -24,7 +24,6 @@ from __future__ import print_function
 import array
 import base64
 import binascii
-import ConfigParser
 import dbus
 import httplib
 import ldap
@@ -43,6 +42,7 @@ import shlex
 import pipes
 
 from six.moves import urllib
+from six.moves.configparser import ConfigParser
 
 from ipalib import api
 from ipalib import pkcs10, x509
@@ -494,7 +494,7 @@ class CAInstance(DogtagInstance):
         os.chown(cfg_file, pent.pw_uid, pent.pw_gid)
 
         # Create CA configuration
-        config = ConfigParser.ConfigParser()
+        config = ConfigParser()
         config.optionxform = str
         config.add_section("CA")
 
diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py
index 3e07ee398..5da6d5aef 100644
--- a/ipaserver/install/certs.py
+++ b/ipaserver/install/certs.py
@@ -29,7 +29,8 @@ from hashlib import sha1
 import fcntl
 import time
 import datetime
-import ConfigParser as configparser
+
+from six.moves import configparser
 
 from ipapython.ipa_log_manager import root_logger
 from ipapython import dogtag
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index ad79f8896..58be9f233 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -28,7 +28,6 @@ import fileinput
 import sys
 import tempfile
 import shutil
-from ConfigParser import SafeConfigParser, NoOptionError
 import traceback
 import textwrap
 from contextlib import contextmanager
@@ -38,6 +37,7 @@ from dns.exception import DNSException
 import ldap
 from nss.error import NSPRError
 import six
+from six.moves.configparser import SafeConfigParser, NoOptionError
 
 import ipaplatform
 
diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py
index f9e3a700a..28054be3f 100644
--- a/ipaserver/install/ipa_backup.py
+++ b/ipaserver/install/ipa_backup.py
@@ -24,10 +24,11 @@ import tempfile
 import time
 import pwd
 from optparse import OptionGroup
-from ConfigParser import SafeConfigParser
 from ipaplatform.paths import paths
 from ipaplatform import services
 
+from six.moves.configparser import SafeConfigParser
+
 from ipalib import api, errors
 from ipapython import version
 from ipapython.ipautil import run, write_tmp_file
@@ -40,7 +41,7 @@ from ipaserver.install import installutils
 from ipapython import ipaldap
 from ipalib.session import ISO8601_DATETIME_FMT
 from ipalib.constants import CACERT
-from ConfigParser import SafeConfigParser
+from six.moves.configparser import SafeConfigParser
 from ipaplatform.tasks import tasks
 
 """
diff --git a/ipaserver/install/ipa_replica_prepare.py b/ipaserver/install/ipa_replica_prepare.py
index cd780d74c..2b4a60e16 100644
--- a/ipaserver/install/ipa_replica_prepare.py
+++ b/ipaserver/install/ipa_replica_prepare.py
@@ -26,9 +26,9 @@ import shutil
 import tempfile
 import time
 from optparse import OptionGroup, SUPPRESS_HELP
-from ConfigParser import SafeConfigParser
 
 import dns.resolver
+from six.moves.configparser import SafeConfigParser
 
 from ipaserver.install import certs, installutils, bindinstance, dsinstance
 from ipaserver.install.replication import enable_replication_version_checking
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index 6f24a4818..792ad54c5 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -23,10 +23,11 @@ import shutil
 import tempfile
 import time
 import pwd
-from ConfigParser import SafeConfigParser
 import ldif
 import itertools
 
+from six.moves.configparser import SafeConfigParser
+
 from ipalib import api, errors, constants
 from ipapython import version, ipautil, certdb
 from ipapython.ipautil import run, user_input
diff --git a/ipaserver/install/krainstance.py b/ipaserver/install/krainstance.py
index 485271b02..778637a8a 100644
--- a/ipaserver/install/krainstance.py
+++ b/ipaserver/install/krainstance.py
@@ -17,13 +17,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import ConfigParser
 import os
 import pwd
 import shutil
 import sys
 import tempfile
 
+from six.moves.configparser import ConfigParser
+
 from ipalib import api
 from ipalib import x509
 from ipaplatform import services
@@ -141,7 +142,7 @@ class KRAInstance(DogtagInstance):
         os.chown(cfg_file, pent.pw_uid, pent.pw_gid)
 
         # Create KRA configuration
-        config = ConfigParser.ConfigParser()
+        config = ConfigParser()
         config.optionxform = str
         config.add_section("KRA")
 
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py
index 4df621947..20450df34 100644
--- a/ipaserver/install/server/upgrade.py
+++ b/ipaserver/install/server/upgrade.py
@@ -9,10 +9,10 @@ import os
 import shutil
 import pwd
 import fileinput
-import ConfigParser
 import sys
 
 import six
+from six.moves.configparser import SafeConfigParser
 
 from ipalib import api
 import SSSDConfig
@@ -1088,7 +1088,7 @@ def uninstall_selfsign(ds, http):
 
     root_logger.warning(
         'Removing self-signed CA. Certificates will need to managed manually.')
-    p = ConfigParser.SafeConfigParser()
+    p = SafeConfigParser()
     p.read(paths.IPA_DEFAULT_CONF)
     p.set('global', 'enable_ra', 'False')
     p.set('global', 'ra_plugin', 'none')