mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #16414: Fix support.TESTFN_UNDECODABLE and test_genericpath.test_nonascii_abspath()

Browse source 
* support.TESTFN_UNDECODABLE was decodable if the filesystem encoding was
   cp932
 * test_genericpath.test_nonascii_abspath() didn't work on Windows if the
   path was not decodable (ex: with cp932)
This commit is contained in:
Victor Stinner 2012-11-06 23:33:46 +01:00
parent 8b219b2936
commit 8f049e5b5b
2 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/support.py
View file

@ -677,7 +677,11 @@ elif sys.platform != 'darwin':
# decoded from the filesystem encoding (in strict mode). It can be None if we # decoded from the filesystem encoding (in strict mode). It can be None if we
# cannot generate such filename. # cannot generate such filename.
TESTFN_UNDECODABLE = None TESTFN_UNDECODABLE = None
for name in (b'abc\xff', b'\xe7w\xf0'): # b'\xff' is not decodable by os.fsdecode() with code page 932. Windows
# accepts it to create a file or a directory, or don't accept to enter to
# such directory (when the bytes name is used). So test b'\xe7' first: it is
# not decodable from cp932.
for name in (b'\xe7w\xf0', b'abc\xff'):
try: try:
os.fsdecode(name) os.fsdecode(name)
except UnicodeDecodeError: except UnicodeDecodeError:

17
Lib/test/test_genericpath.py
View file

@ -308,17 +308,28 @@ class CommonTest(GenericTest):
for path in ('', 'fuu', 'f\xf9\xf9', '/fuu', 'U:\\'): for path in ('', 'fuu', 'f\xf9\xf9', '/fuu', 'U:\\'):
self.assertIsInstance(abspath(path), str) self.assertIsInstance(abspath(path), str)
@unittest.skipIf(sys.platform == 'darwin',
"Mac OS X denies the creation of a directory with an invalid utf8 name")
def test_nonascii_abspath(self): def test_nonascii_abspath(self):
# Test non-ASCII in the path
if sys.platform in ('win32', 'darwin'):
if support.TESTFN_NONASCII:
name = support.TESTFN_NONASCII
else:
# Mac OS X denies the creation of a directory with an invalid
# UTF-8 name. Windows allows to create a directory with an
# arbitrary bytes name, but fails to enter this directory
# (when the bytes name is used).
self.skipTest("need support.TESTFN_NONASCII")
else:
if support.TESTFN_UNDECODABLE: if support.TESTFN_UNDECODABLE:
name = support.TESTFN_UNDECODABLE name = support.TESTFN_UNDECODABLE
elif support.TESTFN_NONASCII: elif support.TESTFN_NONASCII:
name = support.TESTFN_NONASCII name = support.TESTFN_NONASCII
else: else:
# On UNIX, the surrogateescape error handler is used to
# decode paths, so any byte is allowed, it does not depend
# on the locale
name = b'a\xffb\xe7w\xf0' name = b'a\xffb\xe7w\xf0'
# Test non-ASCII, non-UTF8 bytes in the path.
with warnings.catch_warnings(): with warnings.catch_warnings():
warnings.simplefilter("ignore", DeprecationWarning) warnings.simplefilter("ignore", DeprecationWarning)
with support.temp_cwd(name): with support.temp_cwd(name):