summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xipa-client/ipa-install/ipa-client-install2
-rw-r--r--ipalib/config.py2
-rw-r--r--ipapython/config.py6
-rw-r--r--ipapython/dogtag.py6
-rw-r--r--ipapython/sysrestore.py10
-rw-r--r--ipaserver/install/ca.py3
-rw-r--r--ipaserver/install/cainstance.py4
-rw-r--r--ipaserver/install/certs.py3
-rw-r--r--ipaserver/install/installutils.py2
-rw-r--r--ipaserver/install/ipa_backup.py5
-rw-r--r--ipaserver/install/ipa_replica_prepare.py2
-rw-r--r--ipaserver/install/ipa_restore.py3
-rw-r--r--ipaserver/install/krainstance.py5
-rw-r--r--ipaserver/install/server/upgrade.py4
14 files changed, 32 insertions, 25 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index fb47c8a9c..c50ea67cb 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/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
diff --git a/ipalib/config.py b/ipalib/config.py
index 27084577e..c7a5c5fc7 100644
--- a/ipalib/config.py
+++ b/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
diff --git a/ipapython/config.py b/ipapython/config.py
index 996e761f2..cd61db0b2 100644
--- a/ipapython/config.py
+++ b/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:
diff --git a/ipapython/dogtag.py b/ipapython/dogtag.py
index 398ee0fc4..bad8039f2 100644
--- a/ipapython/dogtag.py
+++ b/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)
diff --git a/ipapython/sysrestore.py b/ipapython/sysrestore.py
index 8ce8e4b7a..830060c5a 100644
--- a/ipapython/sysrestore.py
+++ b/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)
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')
generated by cgit (git 2.34.1) at 2025-05-18 20:27:06 +0000