From 84f7afe65c29330f3ff8e318e054b96554a2dede Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nas-github@arctrix.com>
Date: Sun, 21 Feb 2021 14:22:14 -0800
Subject: Fix failed merge of bpo-43288. (GH-24614)

---
 Lib/test/test_importlib/fixtures.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_importlib/fixtures.py b/Lib/test/test_importlib/fixtures.py
index d5bd74e..acf6bc8 100644
--- a/Lib/test/test_importlib/fixtures.py
+++ b/Lib/test/test_importlib/fixtures.py
@@ -220,8 +220,6 @@ class LocalPackage:
         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"
-- 
cgit v0.12