Replace io.open() and codecs.open() with builtin open()

In Python 3, these are functionally equivalent and share the same
feature set.
This commit is contained in:
Jon Dufresne 2020-12-24 14:13:52 -08:00
parent f91ba6b348
commit a1fff4a080
5 changed files with 4 additions and 8 deletions

View File

@ -1,7 +1,6 @@
# The following comment should be removed at some point in the future. # The following comment should be removed at some point in the future.
# mypy: disallow-untyped-defs=False # mypy: disallow-untyped-defs=False
import codecs
import os import os
import sys import sys
@ -12,7 +11,7 @@ def read(rel_path):
here = os.path.abspath(os.path.dirname(__file__)) here = os.path.abspath(os.path.dirname(__file__))
# intentionally *not* adding an encoding option to open, See: # intentionally *not* adding an encoding option to open, See:
# https://github.com/pypa/virtualenv/issues/201#issuecomment-3145690 # https://github.com/pypa/virtualenv/issues/201#issuecomment-3145690
with codecs.open(os.path.join(here, rel_path), 'r') as fp: with open(os.path.join(here, rel_path), 'r') as fp:
return fp.read() return fp.read()

View File

@ -1,4 +1,3 @@
import io
import os import os
from collections import namedtuple from collections import namedtuple
@ -62,7 +61,7 @@ def load_pyproject_toml(
has_setup = os.path.isfile(setup_py) has_setup = os.path.isfile(setup_py)
if has_pyproject: if has_pyproject:
with io.open(pyproject_toml, encoding="utf-8") as f: with open(pyproject_toml, encoding="utf-8") as f:
pp_toml = toml.load(f) pp_toml = toml.load(f)
build_system = pp_toml.get("build-system") build_system = pp_toml.get("build-system")
else: else:

View File

@ -1,4 +1,3 @@
import io
import logging import logging
import os import os
import re import re
@ -52,7 +51,7 @@ def _get_pyvenv_cfg_lines():
try: try:
# Although PEP 405 does not specify, the built-in venv module always # Although PEP 405 does not specify, the built-in venv module always
# writes with UTF-8. (pypa/pip#8717) # writes with UTF-8. (pypa/pip#8717)
with io.open(pyvenv_cfg_file, encoding='utf-8') as f: with open(pyvenv_cfg_file, encoding='utf-8') as f:
return f.read().splitlines() # avoids trailing newlines return f.read().splitlines() # avoids trailing newlines
except IOError: except IOError:
return None return None

View File

@ -4,7 +4,6 @@ These are written according to the order they are called in.
""" """
import contextlib import contextlib
import io
import os import os
import pathlib import pathlib
import subprocess import subprocess
@ -75,7 +74,7 @@ def generate_authors(filename: str) -> None:
authors = get_author_list() authors = get_author_list()
# Write our authors to the AUTHORS file # Write our authors to the AUTHORS file
with io.open(filename, "w", encoding="utf-8") as fp: with open(filename, "w", encoding="utf-8") as fp:
fp.write("\n".join(authors)) fp.write("\n".join(authors))
fp.write("\n") fp.write("\n")