summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-01-03 00:56:38 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-01-03 00:56:38 (GMT)
commit269b3ce40065afa3328953ec42657184da22f96b (patch)
tree006f9ea7378ac0e18474d13843b4a1138f7100d7 /Lib
parent7ae320d66787e2b4dec293350ec379d5d04fe81b (diff)
parent0af71aae2d914e0833edfc344b493bbb74292645 (diff)
downloadcpython-269b3ce40065afa3328953ec42657184da22f96b.zip
cpython-269b3ce40065afa3328953ec42657184da22f96b.tar.gz
cpython-269b3ce40065afa3328953ec42657184da22f96b.tar.bz2
(Merge 3.2) Issue #16218, #16414, #16444: Backport FS_NONASCII,
TESTFN_UNDECODABLE, TESTFN_NONASCII of test.support from Python 3.4. Backport tests on non-ASCII paths.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/support.py3
-rw-r--r--Lib/test/test_cmd_line_script.py9
-rw-r--r--Lib/test/test_genericpath.py21
3 files changed, 18 insertions, 15 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py
index d0a37ea..1e3aef0 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -710,6 +710,9 @@ for name in (
b'\xae\xd5'
# undecodable from UTF-8 (UNIX and Mac OS X)
b'\xed\xb2\x80', b'\xed\xb4\x80',
+ # undecodable from shift_jis, cp869, cp874, cp932, cp1250, cp1251, cp1252,
+ # cp1253, cp1254, cp1255, cp1257, cp1258
+ b'\x81\x98',
):
try:
name.decode(TESTFN_ENCODING)
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
index f066204..6051e18 100644
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -367,11 +367,10 @@ class CmdLineTest(unittest.TestCase):
# Mac OS X denies the creation of a file with an invalid UTF-8 name.
# Windows allows to create a name with an arbitrary bytes name, but
# Python cannot a undecodable bytes argument to a subprocess.
- #if (support.TESTFN_UNDECODABLE
- #and sys.platform not in ('win32', 'darwin')):
- # name = os.fsdecode(support.TESTFN_UNDECODABLE)
- #elif support.TESTFN_NONASCII:
- if support.TESTFN_NONASCII:
+ if (support.TESTFN_UNDECODABLE
+ and sys.platform not in ('win32', 'darwin')):
+ name = os.fsdecode(support.TESTFN_UNDECODABLE)
+ elif support.TESTFN_NONASCII:
name = support.TESTFN_NONASCII
else:
self.skipTest("need support.TESTFN_NONASCII")
diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
index 3eadd58..08061fa 100644
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -308,17 +308,18 @@ class CommonTest(GenericTest):
for path in ('', 'fuu', 'f\xf9\xf9', '/fuu', 'U:\\'):
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):
- name = b'\xe7w\xf0'
- if sys.platform == 'win32':
- try:
- os.fsdecode(name)
- except UnicodeDecodeError:
- self.skipTest("the filename %a is not decodable "
- "from the ANSI code page %s"
- % (name, sys.getfilesystemencoding()))
+ 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:
+ self.skipTest("need support.TESTFN_NONASCII")
# Test non-ASCII, non-UTF8 bytes in the path.
with warnings.catch_warnings():