mirror of
https://github.com/python/cpython.git
synced 2025-08-31 14:07:50 +00:00
Check if data is decoded by os.fsdecode() (filesystem encoding with surrogateescape error handler, PEP 383), not by UTF-8 or the filesystem encoding in strict mode. Use TESTFN_UNDECODABLE in test_cmd_line_script.test_non_ascii() on UNIX.
This commit is contained in:
parent
ef3971d3e5
commit
ff3d515952
3 changed files with 42 additions and 29 deletions
|
@ -309,26 +309,17 @@ class CommonTest(GenericTest):
|
|||
self.assertIsInstance(abspath(path), str)
|
||||
|
||||
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")
|
||||
if (support.TESTFN_UNDECODABLE
|
||||
# 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).
|
||||
and sys.platform not in ('win32', 'darwin')):
|
||||
name = support.TESTFN_UNDECODABLE
|
||||
elif support.TESTFN_NONASCII:
|
||||
name = support.TESTFN_NONASCII
|
||||
else:
|
||||
if support.TESTFN_UNDECODABLE:
|
||||
name = support.TESTFN_UNDECODABLE
|
||||
elif support.TESTFN_NONASCII:
|
||||
name = support.TESTFN_NONASCII
|
||||
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'
|
||||
self.skipTest("need support.TESTFN_NONASCII")
|
||||
|
||||
with warnings.catch_warnings():
|
||||
warnings.simplefilter("ignore", DeprecationWarning)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue