Sync with current cpython branch of importlib_metadata

Author: warsaw

Lib/test/test_importlib/fixtures.py

@@ -210,17 +210,6 @@ def build_files(file_defs, prefix=pathlib.Path()):
                     f.write(DALS(contents))
 
 
-class FileBuilder:
-    def unicode_filename(self):
-        try:
-            from test.support import os_helper
-        except ImportError:
-            # outside CPython, hard-code a unicode snowman
-            return '☃'
-        return os_helper.FS_NONASCII or \
-            self.skip("File system does not support non-ascii.")
-
-
 def DALS(str):
     "Dedent and left-strip"
     return textwrap.dedent(str).lstrip()

Lib/test/test_importlib/test_main.py

@@ -254,16 +254,11 @@ def test_attr(self):
         assert self.ep.attr is None
 
 
-class FileSystem(
-        fixtures.OnSysPath, fixtures.SiteDir, fixtures.FileBuilder,
-        unittest.TestCase):
+class FileSystem(fixtures.OnSysPath, fixtures.SiteDir, 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(
-            {self.unicode_filename(): {}},
-            prefix=self.site_dir,
-            )
+        fixtures.build_files({'☃': {}}, prefix=self.site_dir)
         list(distributions())