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>

ipa-client/ipa-install/ipa-client-install

@@ -29,7 +29,7 @@ try:
     import socket
     import tempfile
     import getpass
-    from ConfigParser import RawConfigParser
+    from six.moves.configparser import RawConfigParser
     from optparse import SUPPRESS_HELP, OptionGroup, OptionValueError
     import shutil
     import dns

ipalib/config.py

@@ -29,7 +29,6 @@ of the process.
 For the per-request thread-local information, see `ipalib.request`.
 """
 
-from ConfigParser import RawConfigParser, ParsingError
 from types import NoneType
 import os
 from os import path
@@ -37,6 +36,7 @@ import sys
 
 import six
 from six.moves.urllib.parse import urlparse, urlunparse
+from six.moves.configparser import RawConfigParser, ParsingError
 
 from ipapython.dn import DN
 from ipalib.base import check_name

ipapython/config.py

@@ -17,11 +17,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import ConfigParser
 from optparse import Option, Values, OptionParser, IndentedHelpFormatter, OptionValueError
 from copy import copy
+
 from dns import resolver, rdatatype
 from dns.exception import DNSException
+from six.moves.configparser import SafeConfigParser
+
 from ipapython.dn import DN
 from ipaplatform.paths import paths
 import dns.name
@@ -152,7 +154,7 @@ class IPAConfig:
 config = IPAConfig()
 
 def __parse_config(discover_server = True):
-    p = ConfigParser.SafeConfigParser()
+    p = SafeConfigParser()
     p.read(paths.IPA_DEFAULT_CONF)
 
     try:

ipapython/dogtag.py

@@ -21,10 +21,10 @@ import collections
 import os
 import httplib
 import xml.dom.minidom
-import ConfigParser
 
 import nss.nss as nss
 import six
+from six.moves import configparser
 from six.moves.urllib.parse import urlencode
 
 from ipalib import api, errors
@@ -143,11 +143,11 @@ def _get_configured_version(api):
     if api:
         return int(api.env.dogtag_version)
     else:
-        p = ConfigParser.SafeConfigParser()
+        p = configparser.SafeConfigParser()
         p.read(paths.IPA_DEFAULT_CONF)
         try:
             version = p.get('global', 'dogtag_version')
-        except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
+        except (configparser.NoOptionError, configparser.NoSectionError):
             return 9
         else:
             return int(version)

ipapython/sysrestore.py

@@ -27,11 +27,11 @@ import os
 import os.path
 import shutil
 from ipapython.ipa_log_manager import *
-import ConfigParser
 import random
 import string
 
 import six
+from six.moves.configparser import SafeConfigParser
 
 from ipapython import ipautil
 from ipaplatform.tasks import tasks
@@ -71,7 +71,7 @@ class FileStore:
 
         self.files = {}
 
-        p = ConfigParser.SafeConfigParser()
+        p = SafeConfigParser()
         p.read(self._index)
 
         for section in p.sections():
@@ -92,7 +92,7 @@ class FileStore:
                 os.remove(self._index)
             return
 
-        p = ConfigParser.SafeConfigParser()
+        p = SafeConfigParser()
 
         p.add_section('files')
         for (key, value) in self.files.items():
@@ -327,7 +327,7 @@ class StateFile:
 
         self.modules = {}
 
-        p = ConfigParser.SafeConfigParser()
+        p = SafeConfigParser()
         p.read(self._path)
 
         for module in p.sections():
@@ -355,7 +355,7 @@ class StateFile:
                 os.remove(self._path)
             return
 
-        p = ConfigParser.SafeConfigParser()
+        p = SafeConfigParser()
 
         for module in self.modules.keys():
             p.add_section(module)

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
 

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")
 

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

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
 

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
 
 """

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

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

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")
 

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')