Issue #15478: Raising an OSError doesn't decode or encode the filename anymore

Pass the original filename argument to OSError constructor, instead of trying
to encode it to or decode it from the filesystem encoding. This change avoids
an additionnal UnicodeDecodeError on Windows if the filename cannot be decoded
from the filesystem encoding (ANSI code page).

1 files changed, 11 insertions, 0 deletions

diff --git a/Lib/test/support.py b/Lib/test/support.py
index c5640e0..1717c06 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -647,6 +647,17 @@ elif sys.platform != 'darwin':
         # the byte 0xff. Skip some unicode filename tests.
         pass
 
+# TESTFN_UNDECODABLE is a filename (bytes type) that should *not* be able to be
+# decoded from the filesystem encoding (in strict mode). It can be None if we
+# cannot generate such filename.
+TESTFN_UNDECODABLE = None
+for name in (b'abc\xff', b'\xe7w\xf0'):
+    try:
+        os.fsdecode(name)
+    except UnicodeDecodeErorr:
+        TESTFN_UNDECODABLE = name
+        break
+
 # Save the initial cwd
 SAVEDCWD = os.getcwd()