[Python-checkins] bpo-39791: Support file systems that cannot support non-ascii filenames (skipping tests in that case). (#20681)

Sun Jun 7 10:57:50 EDT 2020

https://github.com/python/cpython/commit/2efe18bf277dd0f38a1d248ae6bdd30947c26880
commit: 2efe18bf277dd0f38a1d248ae6bdd30947c26880
branch: master
author: Jason R. Coombs <jaraco at jaraco.com>
committer: GitHub <noreply at github.com>
date: 2020年06月07日T10:57:45-04:00
summary:
bpo-39791: Support file systems that cannot support non-ascii filenames (skipping tests in that case). (#20681)
files:
M Lib/test/test_importlib/fixtures.py
M Lib/test/test_importlib/test_main.py

diff --git a/Lib/test/test_importlib/fixtures.py b/Lib/test/test_importlib/fixtures.py
index b25febb7fe756..2e55d14b9aab9 100644
--- a/Lib/test/test_importlib/fixtures.py
+++ b/Lib/test/test_importlib/fixtures.py
@@ -210,6 +210,17 @@ def build_files(file_defs, prefix=pathlib.Path()):
 f.write(DALS(contents))
 
 
+class FileBuilder:
+ def unicode_filename(self):
+ try:
+ import test.support
+ except ImportError:
+ # outside CPython, hard-code a unicode snowman
+ return '☃'
+ return test.support.FS_NONASCII or \
+ self.skip("File system does not support non-ascii.")
+
+
 def DALS(str):
 "Dedent and left-strip"
 return textwrap.dedent(str).lstrip()
diff --git a/Lib/test/test_importlib/test_main.py b/Lib/test/test_importlib/test_main.py
index 7b18c3de16eea..91e501a2eb7cd 100644
--- a/Lib/test/test_importlib/test_main.py
+++ b/Lib/test/test_importlib/test_main.py
@@ -254,11 +254,16 @@ def test_attr(self):
 assert self.ep.attr is None
 
 
-class FileSystem(fixtures.OnSysPath, fixtures.SiteDir, unittest.TestCase):
+class FileSystem(
+ fixtures.OnSysPath, fixtures.SiteDir, fixtures.FileBuilder,
+ unittest.TestCase):
 def test_unicode_dir_on_sys_path(self):
 """
 Ensure a Unicode subdirectory of a directory on sys.path
 does not crash.
 """
- fixtures.build_files({'☃': {}}, prefix=self.site_dir)
+ fixtures.build_files(
+ {self.unicode_filename(): {}},
+ prefix=self.site_dir,
+ )
 list(distributions())
