[3.9] bpo-41069: Make TESTFN and the CWD for tests containing non-ascii characters. (GH-21035). (GH-21156)
(cherry picked from commit 700cfa8c90a90016638bac13c4efd03786b2b2a0)
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 0db7d30..bf1cb5f 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -1173,7 +1173,7 @@
os.makedirs(t2_path)
for path in tmp1_path, tmp2_path, tmp3_path, tmp4_path, tmp5_path:
- with open(path, "x") as f:
+ with open(path, "x", encoding='utf-8') as f:
f.write("I'm " + path + " and proud of it. Blame test_os.\n")
if support.can_symlink():
@@ -2359,7 +2359,7 @@
file_name = 'FILE%d' % i
file_path = os.path.join(support.TESTFN, file_name)
os.makedirs(dir_path)
- with open(file_path, 'w') as f:
+ with open(file_path, 'w', encoding='utf-8') as f:
f.write("I'm %s and proud of it. Blame test_os.\n" % file_path)
self.created_paths.extend([dir_name, file_name])
self.created_paths.sort()
@@ -3737,7 +3737,7 @@
if os.name == 'nt':
bytes_fspath = bytes_filename = None
else:
- bytes_filename = support.TESTFN.encode('ascii')
+ bytes_filename = os.fsencode(support.TESTFN)
bytes_fspath = FakePath(bytes_filename)
fd = os.open(FakePath(str_filename), os.O_WRONLY|os.O_CREAT)
self.addCleanup(support.unlink, support.TESTFN)