switch from io.open to open

With this extension only supporting Python 3, there is no longer a need
to use `io.open` for opening files. Switching to use `open`.

Signed-off-by: James Knight <[email protected]>

Author: jdknight

sphinxcontrib/confluencebuilder/builder.py

@@ -38,7 +38,6 @@
 from sphinxcontrib.confluencebuilder.util import first
 from sphinxcontrib.confluencebuilder.util import handle_cli_file_subset
 from sphinxcontrib.confluencebuilder.writer import ConfluenceWriter
-import io
 import os
 import tempfile
 
@@ -477,7 +476,7 @@ def write_doc(self, docname, doctree):
         if self.writer.output is not None:
             ensuredir(path.dirname(outfilename))
             try:
-                with io.open(outfilename, 'w', encoding='utf-8') as file:
+                with open(outfilename, 'w', encoding='utf-8') as file:
                     if self.writer.output:
                         file.write(self.writer.output)
             except (IOError, OSError) as err:
@@ -733,7 +732,7 @@ def finish(self):
                 docfile = path.join(self.outdir, self.file_transform(docname))
 
                 try:
-                    with io.open(docfile, 'r', encoding='utf-8') as file:
+                    with open(docfile, 'r', encoding='utf-8') as file:
                         output = file.read()
                         self.publish_doc(docname, output)
 
@@ -864,7 +863,7 @@ def _generate_special_document(self, docname, generator):
                 fname = path.join(self.env.srcdir,
                     self.config.confluence_header_file)
                 try:
-                    with io.open(fname, encoding='utf-8') as file:
+                    with open(fname, encoding='utf-8') as file:
                         header_template_data = file.read() + '\n'
                 except (IOError, OSError) as err:
                     self.warn('error reading file {}: {}'.format(fname, err))
@@ -886,7 +885,7 @@ def _generate_special_document(self, docname, generator):
                 fname = path.join(self.env.srcdir,
                     self.config.confluence_footer_file)
                 try:
-                    with io.open(fname, encoding='utf-8') as file:
+                    with open(fname, encoding='utf-8') as file:
                         footer_template_data = file.read() + '\n'
                 except (IOError, OSError) as err:
                     self.warn('error reading file {}: {}'.format(fname, err))
@@ -902,7 +901,7 @@ def _generate_special_document(self, docname, generator):
         # generate/replace the document in the output directory
         fname = path.join(self.outdir, docname + self.file_suffix)
         try:
-            with io.open(fname, 'w', encoding='utf-8') as f:
+            with open(fname, 'w', encoding='utf-8') as f:
                 f.write(self._cached_header_data)
                 generator(self, docname, f)
                 f.write(self._cached_footer_data)

sphinxcontrib/confluencebuilder/logger.py

@@ -5,7 +5,6 @@
 from contextlib import suppress
 from sphinx.util import logging
 from sphinx.util.console import bold  # pylint: disable=no-name-in-module
-import io
 import sys
 
 
@@ -118,7 +117,7 @@ def trace(container, data):
         This is solely for manually debugging unexpected scenarios.
         """
         try:
-            with io.open('trace.log', 'a', encoding='utf-8') as file:
+            with open('trace.log', 'a', encoding='utf-8') as file:
                 file.write(u'[%s]\n' % container)
                 file.write(data)
                 file.write(u'\n')

sphinxcontrib/confluencebuilder/translator.py

@@ -15,7 +15,6 @@
 from sphinxcontrib.confluencebuilder.util import convert_length
 from sphinxcontrib.confluencebuilder.util import extract_length
 from sphinxcontrib.confluencebuilder.util import remove_nonspace_control_chars
-import io
 import sys
 
 
@@ -92,7 +91,7 @@ def depart_document(self, node):
             header_file = path.join(self.builder.env.srcdir,
                 self.builder.config.confluence_header_file)
             try:
-                with io.open(header_file, encoding='utf-8') as file:
+                with open(header_file, encoding='utf-8') as file:
                     header_template_data = file.read()
             except (IOError, OSError) as err:
                 self.warn('error reading file {}: {}'.format(header_file, err))
@@ -115,7 +114,7 @@ def depart_document(self, node):
             footer_file = path.join(self.builder.env.srcdir,
                 self.builder.config.confluence_footer_file)
             try:
-                with io.open(footer_file, encoding='utf-8') as file:
+                with open(footer_file, encoding='utf-8') as file:
                     footer_template_data = file.read()
             except (IOError, OSError) as err:
                 self.warn('error reading file {}: {}'.format(footer_file, err))

tests/lib/__init__.py

@@ -16,7 +16,6 @@
 import builtins
 import http.server as http_server
 import inspect
-import io
 import json
 import os
 import shutil
@@ -455,7 +454,7 @@ def parse(filename, dirname=None):
 
     target += '.conf'
 
-    with io.open(target, encoding='utf-8') as fp:
+    with open(target, encoding='utf-8') as fp:
         soup = BeautifulSoup(fp, 'html.parser')
         yield soup
 

tests/test_sandbox.py

@@ -8,7 +8,6 @@
 from tests.lib import prepare_dirs
 from tests.lib import prepare_sphinx
 import argparse
-import io
 import os
 import sys
 
@@ -48,7 +47,7 @@ def process_raw_upload(target_sandbox):
                 'labels': [],
             }
 
-            with io.open(raw_file, 'r', encoding='utf-8') as f:
+            with open(raw_file, 'r', encoding='utf-8') as f:
                 data['content'] = f.read()
 
             print('[sandbox] publishing page...')

tests/unit-tests/test_config_prev_next.py

@@ -2,7 +2,6 @@
 # Copyright 2020-2023 Sphinx Confluence Builder Contributors (AUTHORS)
 
 from tests.lib.testcase import ConfluenceTestCase
-import io
 import os
 
 
@@ -58,7 +57,7 @@ def _character_check(self, name, output, expected):
         self.assertTrue(os.path.exists(test_path),
             'missing output file: {}'.format(test_path))
 
-        with io.open(test_path, encoding='utf8') as test_file:
+        with open(test_path, encoding='utf8') as test_file:
             data = ''.join([o.strip() + '\n' for o in test_file.readlines()])
             for char, count in expected.items():
                 found = data.count(char)