Replace io.open with open

sebastinas · sebastinas · commit d3248ca029ef · 2020-10-13T21:18:30.000+02:00
diff --git a/bpython/args.py b/bpython/args.py
@@ -134,7 +134,7 @@ def exec_code(interpreter, args):
     Helper to execute code in a given interpreter. args should be a [faked]
     sys.argv
     """
-    with open(args[0], "r") as sourcefile:
+    with open(args[0]) as sourcefile:
         source = sourcefile.read()
     old_argv, sys.argv = sys.argv, args
     sys.path.insert(0, os.path.abspath(os.path.dirname(args[0])))
diff --git a/bpython/config.py b/bpython/config.py
@@ -304,7 +304,7 @@ def get_key_no_doublebind(command):
 
 def load_theme(struct, path, colors, default_colors):
     theme = ConfigParser()
-    with open(path, "r") as f:
+    with open(path) as f:
         theme.readfp(f)
     for k, v in chain(theme.items("syntax"), theme.items("interface")):
         if theme.has_option("syntax", k):
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -1,5 +1,4 @@
 import collections
-import io
 import logging
 import sys
 from optparse import Option
@@ -178,7 +177,7 @@ def main(args=None, locals_=None, banner=None, welcome_message=None):
         if options.paste:
             paste = curtsies.events.PasteEvent()
             encoding = inspection.get_encoding_file(exec_args[0])
-            with io.open(exec_args[0], encoding=encoding) as f:
+            with open(exec_args[0], encoding=encoding) as f:
                 sourcecode = f.read()
             paste.events.extend(sourcecode)
         else:
diff --git a/bpython/history.py b/bpython/history.py
@@ -21,7 +21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import io
 import os
 import stat
 from itertools import islice
@@ -170,7 +169,7 @@ def reset(self):
         self.saved_line = ""
 
     def load(self, filename, encoding):
-        with io.open(
+        with open(
             filename, "r", encoding=encoding, errors="ignore"
         ) as hfile:
             with FileLock(hfile, filename=filename):
@@ -188,7 +187,7 @@ def save(self, filename, encoding, lines=0):
             os.O_WRONLY | os.O_CREAT | os.O_TRUNC,
             stat.S_IRUSR | stat.S_IWUSR,
         )
-        with io.open(fd, "w", encoding=encoding, errors="ignore") as hfile:
+        with open(fd, "w", encoding=encoding, errors="ignore") as hfile:
             with FileLock(hfile, filename=filename):
                 self.save_to(hfile, self.entries, lines)
 
@@ -209,7 +208,7 @@ def append_reload_and_write(self, s, filename, encoding):
                 os.O_APPEND | os.O_RDWR | os.O_CREAT,
                 stat.S_IRUSR | stat.S_IWUSR,
             )
-            with io.open(fd, "a+", encoding=encoding, errors="ignore") as hfile:
+            with open(fd, "a+", encoding=encoding, errors="ignore") as hfile:
                 with FileLock(hfile, filename=filename):
                     # read entries
                     hfile.seek(0, os.SEEK_SET)
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -23,7 +23,6 @@
 
 
 import inspect
-import io
 import keyword
 import pydoc
 from collections import namedtuple
@@ -350,7 +349,7 @@ def get_encoding_comment(source):
 
 def get_encoding_file(fname):
     """Try to obtain encoding information from a Python source file."""
-    with io.open(fname, "rt", encoding="ascii", errors="ignore") as f:
+    with open(fname, "rt", encoding="ascii", errors="ignore") as f:
         for unused in range(2):
             line = f.readline()
             match = get_encoding_line_re.search(line)
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -24,7 +24,6 @@
 
 import code
 import inspect
-import io
 import os
 import pkgutil
 import pydoc
@@ -481,7 +480,7 @@ def startup(self):
         filename = os.environ.get("PYTHONSTARTUP")
         if filename:
             encoding = inspection.get_encoding_file(filename)
-            with io.open(filename, "rt", encoding=encoding) as f:
+            with open(filename, "rt", encoding=encoding) as f:
                 source = f.read()
                 self.interp.runsource(source, filename, "exec", encode=False)
 
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -434,7 +434,7 @@ def setUp(self):
         self.repl = create_repl()
 
     def write_startup_file(self, fname, encoding):
-        with io.open(fname, mode="wt", encoding=encoding) as f:
+        with open(fname, mode="wt", encoding=encoding) as f:
             f.write("# coding: ")
             f.write(encoding)
             f.write("\n")
diff --git a/bpython/test/test_history.py b/bpython/test/test_history.py
@@ -1,4 +1,3 @@
-import io
 import os
 
 
@@ -89,7 +88,7 @@ def setUp(self):
         self.filename = "history_temp_file"
         self.encoding = getpreferredencoding()
 
-        with io.open(
+        with open(
             self.filename, "w", encoding=self.encoding, errors="ignore"
         ) as f:
             f.write(b"#1\n#2\n".decode())
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -1338,7 +1338,7 @@ def start(main_loop, user_data):
             # this is CLIRepl.startup inlined.
             filename = os.environ.get("PYTHONSTARTUP")
             if filename and os.path.isfile(filename):
-                with open(filename, "r") as f:
+                with open(filename) as f:
                     interpreter.runsource(f.read(), filename, "exec")
 
         if banner is not None:
