[Python-checkins] bpo-43651: Fix test_compileall with PEP 597 (GH-25128)

Thu Apr 1 20:02:05 EDT 2021

https://github.com/python/cpython/commit/80017752ba938852d53f9d83a404b4ecd9ff2baa
commit: 80017752ba938852d53f9d83a404b4ecd9ff2baa
branch: master
author: Inada Naoki <songofacandy at gmail.com>
committer: methane <songofacandy at gmail.com>
date: 2021年04月02日T09:01:57+09:00
summary:
bpo-43651: Fix test_compileall with PEP 597 (GH-25128)
files:
M Lib/compileall.py
M Lib/multiprocessing/util.py
M Lib/test/test_compileall.py

diff --git a/Lib/compileall.py b/Lib/compileall.py
index 672cb43971869..61b4c5c0af1ad 100644
--- a/Lib/compileall.py
+++ b/Lib/compileall.py
@@ -407,7 +407,8 @@ def main():
 # if flist is provided then load it
 if args.flist:
 try:
- with (sys.stdin if args.flist=='-' else open(args.flist)) as f:
+ with (sys.stdin if args.flist=='-' else
+ open(args.flist, encoding="utf-8")) as f:
 for line in f:
 compile_dests.append(line.strip())
 except OSError:
diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
index 21f2a7ebe2500..a4683339820f5 100644
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -419,7 +419,7 @@ def _close_stdin():
 try:
 fd = os.open(os.devnull, os.O_RDONLY)
 try:
- sys.stdin = open(fd, closefd=False)
+ sys.stdin = open(fd, encoding="utf-8", closefd=False)
 except:
 os.close(fd)
 raise
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
index fa24b3c5a11dd..96a0f8f729aa4 100644
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -58,7 +58,7 @@ def setUp(self):
 self.directory = tempfile.mkdtemp()
 self.source_path = os.path.join(self.directory, '_test.py')
 self.bc_path = importlib.util.cache_from_source(self.source_path)
- with open(self.source_path, 'w') as file:
+ with open(self.source_path, 'w', encoding="utf-8") as file:
 file.write('x = 123\n')
 self.source_path2 = os.path.join(self.directory, '_test2.py')
 self.bc_path2 = importlib.util.cache_from_source(self.source_path2)
@@ -73,7 +73,7 @@ def tearDown(self):
 
 def add_bad_source_file(self):
 self.bad_source_path = os.path.join(self.directory, '_test_bad.py')
- with open(self.bad_source_path, 'w') as file:
+ with open(self.bad_source_path, 'w', encoding="utf-8") as file:
 file.write('x (\n')
 
 def timestamp_metadata(self):
@@ -164,7 +164,7 @@ def test_no_pycache_in_non_package(self):
 data_file = os.path.join(data_dir, 'file')
 os.mkdir(data_dir)
 # touch data/file
- with open(data_file, 'w'):
+ with open(data_file, 'wb'):
 pass
 compileall.compile_file(data_file)
 self.assertFalse(os.path.exists(os.path.join(data_dir, '__pycache__')))
@@ -440,8 +440,7 @@ def setUpClass(cls):
 if not directory.is_dir():
 directory.mkdir()
 directory_created = True
- with path.open('w') as file:
- file.write('# for test_compileall')
+ path.write_text('# for test_compileall', encoding="utf-8")
 except OSError:
 sys_path_writable = False
 break
@@ -704,7 +703,7 @@ def test_include_file_with_arg(self):
 f2 = script_helper.make_script(self.pkgdir, 'f2', '')
 f3 = script_helper.make_script(self.pkgdir, 'f3', '')
 f4 = script_helper.make_script(self.pkgdir, 'f4', '')
- with open(os.path.join(self.directory, 'l1'), 'w') as l1:
+ with open(os.path.join(self.directory, 'l1'), 'w', encoding="utf-8") as l1:
 l1.write(os.path.join(self.pkgdir, 'f1.py')+os.linesep)
 l1.write(os.path.join(self.pkgdir, 'f2.py')+os.linesep)
 self.assertRunOK('-i', os.path.join(self.directory, 'l1'), f4)
@@ -718,7 +717,7 @@ def test_include_file_no_arg(self):
 f2 = script_helper.make_script(self.pkgdir, 'f2', '')
 f3 = script_helper.make_script(self.pkgdir, 'f3', '')
 f4 = script_helper.make_script(self.pkgdir, 'f4', '')
- with open(os.path.join(self.directory, 'l1'), 'w') as l1:
+ with open(os.path.join(self.directory, 'l1'), 'w', encoding="utf-8") as l1:
 l1.write(os.path.join(self.pkgdir, 'f2.py')+os.linesep)
 self.assertRunOK('-i', os.path.join(self.directory, 'l1'))
 self.assertNotCompiled(f1)
