summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Schemenauer <nas-github@arctrix.com>2021-02-21 14:22:14 -0800
committerGitHub <noreply@github.com>2021-02-21 14:22:14 -0800
commit84f7afe65c29330f3ff8e318e054b96554a2dede (patch)
treea4da1325e4687cea641156e056eaaeec37803b32
parent50288aa8c955f66ab67a7dadf250ea5f4238eb67 (diff)
downloadcpython-git-84f7afe65c29330f3ff8e318e054b96554a2dede.tar.gz
Fix failed merge of bpo-43288. (GH-24614)
-rw-r--r--Lib/test/test_importlib/fixtures.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_importlib/fixtures.py b/Lib/test/test_importlib/fixtures.py
index d5bd74ef0f..acf6bc87c7 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"