From 71f501698d64af6463246bc6efdbbf1b85616102 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sun, 7 Jun 2020 08:17:45 -0700 Subject: [PATCH] bpo-39791: Support file systems that cannot support non-ascii filenames (skipping tests in that case). (GH-20681) (cherry picked from commit 2efe18bf277dd0f38a1d248ae6bdd30947c26880) Co-authored-by: Jason R. Coombs --- Lib/test/test_importlib/fixtures.py | 11 +++++++++++ Lib/test/test_importlib/test_main.py | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_importlib/fixtures.py b/Lib/test/test_importlib/fixtures.py index b25febb7fe7..2e55d14b9aa 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 7b18c3de16e..91e501a2eb7 100644 --- a/Lib/test/test_importlib/test_main.py +++ b/Lib/test/test_importlib/test_main.py @@ -254,11 +254,16 @@ class TestEntryPoints(unittest.TestCase): 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())