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

This commit is contained in:
Neil Schemenauer 2021-02-21 14:22:14 -08:00 committed by GitHub
parent 50288aa8c9
commit 84f7afe65c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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"