Issue #3187: Better support for "undecodable" filenames. Code by Victor
Stinner, with small tweaks by GvR.
diff --git a/Lib/test/test_unicode_file.py b/Lib/test/test_unicode_file.py
index cc670db..9caadd8 100644
--- a/Lib/test/test_unicode_file.py
+++ b/Lib/test/test_unicode_file.py
@@ -90,7 +90,7 @@
os.unlink(filename1 + ".new")
def _do_directory(self, make_name, chdir_name, encoded):
- cwd = os.getcwd()
+ cwd = os.getcwdb()
if os.path.isdir(make_name):
os.rmdir(make_name)
os.mkdir(make_name)
@@ -98,10 +98,10 @@
os.chdir(chdir_name)
try:
if not encoded:
- cwd_result = os.getcwdu()
+ cwd_result = os.getcwd()
name_result = make_name
else:
- cwd_result = os.getcwd().decode(TESTFN_ENCODING)
+ cwd_result = os.getcwdb().decode(TESTFN_ENCODING)
name_result = make_name.decode(TESTFN_ENCODING)
cwd_result = unicodedata.normalize("NFD", cwd_result)