[Python-checkins] Fix failed merge of bpo-43288. (GH-24614)

[nascheme]

https://github.com/python/cpython/commit/84f7afe65c29330f3ff8e318e054b96554a2dede
commit: 84f7afe65c29330f3ff8e318e054b96554a2dede
branch: master
author: Neil Schemenauer <nas-github at arctrix.com>
committer: nascheme <nas-github at arctrix.com>
date: 2021-02-21T14:22:14-08:00
summary:

Fix failed merge of bpo-43288. (GH-24614)

files:
M Lib/test/test_importlib/fixtures.py

diff --git a/Lib/test/test_importlib/fixtures.py b/Lib/test/test_importlib/fixtures.py
index d5bd74ef0ffed..acf6bc87c74e9 100644
--- a/Lib/test/test_importlib/fixtures.py
+++ b/Lib/test/test_importlib/fixtures.py
@@ -220,8 +220,6 @@ def setUp(self):
         self.fixtures.enter_context(tempdir_as_cwd())
         build_files(self.files)
 
-    def skip(self, reason):
-        raise unittest.SkipTest(reason)
 
 
 def build_files(file_defs, prefix=pathlib.Path()):
@@ -262,6 +260,9 @@ class FileBuilder:
     def unicode_filename(self):
         return FS_NONASCII or self.skip("File system does not support non-ascii.")
 
+    def skip(self, reason):
+        raise unittest.SkipTest(reason)
+
 
 def DALS(str):
     "Dedent and left-strip"