Skip to content

bpo-39791: Support file systems that cannot support non-ascii filenames. #20681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaraco merged 1 commit into from
Jun 7, 2020
Merged

bpo-39791: Support file systems that cannot support non-ascii filenames. #20681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Lib/test/test_importlib/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,17 @@ def build_files(file_defs, prefix=pathlib.Path()):
f.write(DALS(contents))


class FileBuilder:
def unicode_filename(self):
try:
import test.support
except ImportError:
# outside CPython, hard-code a unicode snowman
return '☃'
return test.support.FS_NONASCII or \
self.skip("File system does not support non-ascii.")


def DALS(str):
"Dedent and left-strip"
return textwrap.dedent(str).lstrip()
Expand Down
9 changes: 7 additions & 2 deletions Lib/test/test_importlib/test_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,16 @@ def test_attr(self):
assert self.ep.attr is None


class FileSystem(fixtures.OnSysPath, fixtures.SiteDir, unittest.TestCase):
class FileSystem(
fixtures.OnSysPath, fixtures.SiteDir, fixtures.FileBuilder,
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({'☃': {}}, prefix=self.site_dir)
fixtures.build_files(
{self.unicode_filename(): {}},
prefix=self.site_dir,
)
list(distributions())