From 187efdfe42e039d6c7e39bab00a1d22751c393e6 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Mon, 14 Sep 2015 14:03:58 +0200
Subject: 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>
---
 ipapython/config.py     |  6 ++++--
 ipapython/dogtag.py     |  6 +++---
 ipapython/sysrestore.py | 10 +++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'ipapython')

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