[Docutils-develop] [PATCH 24/39] py3: Handle 'ConfigParser' to 'configparser' rename

[Stephen F. <st...@th...>]

Signed-off-by: Stephen Finucane <st...@th...ru>
---
 docutils/docutils/frontend.py                 | 15 ++++++++++-----
 docutils/docutils/writers/odf_odt/__init__.py |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docutils/docutils/frontend.py b/docutils/docutils/frontend.py
index 692dc8fcc..2ad9a0a0e 100644
--- a/docutils/docutils/frontend.py
+++ b/docutils/docutils/frontend.py
@@ -33,7 +33,6 @@ import os
 import os.path
 import sys
 import warnings
-import ConfigParser as CP
 import codecs
 import optparse
 from optparse import SUPPRESS_HELP
@@ -44,6 +43,12 @@ from docutils.utils.error_reporting import (locale_encoding, SafeString,
                                             ErrorOutput, ErrorString)
 
 if sys.version_info >= (3, 0):
+    import configparser
+else:
+    import ConfigParser as configparser
+
+
+if sys.version_info > (3, 0):
     unicode = str  # noqa
 
 
@@ -735,7 +740,7 @@ class OptionParser(optparse.OptionParser, docutils.SettingsSpec):
         raise KeyError('No option with dest == %r.' % dest)
 
 
-class ConfigParser(CP.RawConfigParser):
+class ConfigParser(configparser.RawConfigParser):
 
     old_settings = {
         'pep_stylesheet': ('pep_html writer', 'stylesheet'),
@@ -757,7 +762,7 @@ Skipping "%s" configuration file.
 """
 
     def __init__(self, *args, **kwargs):
-        CP.RawConfigParser.__init__(self, *args, **kwargs)
+        configparser.RawConfigParser.__init__(self, *args, **kwargs)
 
         self._files = []
         """List of paths of configuration files read."""
@@ -776,9 +781,9 @@ Skipping "%s" configuration file.
                 continue
             try:
                 if sys.version_info < (3, 0):
-                    CP.RawConfigParser.readfp(self, fp, filename)
+                    configparser.RawConfigParser.readfp(self, fp, filename)
                 else:
-                    CP.RawConfigParser.read_file(self, fp, filename)
+                    configparser.RawConfigParser.read_file(self, fp, filename)
             except UnicodeDecodeError:
                 self._stderr.write(self.not_utf8_error % (filename, filename))
                 fp.close()
diff --git a/docutils/docutils/writers/odf_odt/__init__.py b/docutils/docutils/writers/odf_odt/__init__.py
index 3926ff0a7..9e5267398 100644
--- a/docutils/docutils/writers/odf_odt/__init__.py
+++ b/docutils/docutils/writers/odf_odt/__init__.py
@@ -35,10 +35,12 @@ from docutils.readers import standalone
 from docutils.transforms import references
 
 if sys.version_info >= (3, 0):
+    from configparser import ConfigParser
     from io import StringIO
     from urllib.request import urlopen
     from urllib.error import HTTPError
 else:
+    from ConfigParser import ConfigParser
     from StringIO import StringIO
     from urllib2 import HTTPError
     from urllib2 import urlopen
@@ -899,8 +901,6 @@ class ODFTranslator(nodes.GenericNodeVisitor):
             document.reporter)
         self.format_map = {}
         if self.settings.odf_config_file:
-            from configparser import ConfigParser
-
             parser = ConfigParser()
             parser.read(self.settings.odf_config_file)
             for rststyle, format in parser.items("Formats"):
-- 
2.21.0