Skip to content

FIX: Use correct path to the default font #931

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
corranwebster merged 2 commits into from
Apr 20, 2022
Merged

FIX: Use correct path to the default font #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06daee1
FIX: Use correct path to the default font
Apr 12, 2022
6b756f7
Add regression tests.
corranwebster Apr 19, 2022
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
2 changes: 1 addition & 1 deletion kiva/fonttools/font_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def __init__(self):
data_dir = pkg_resources.resource_filename(
"kiva.fonttools", "data"
)
path = os.path.join(data_dir, " Montserrat-Regular.ttf")
path = os.path.join(data_dir, "Montserrat-Regular.ttf")
self.default_font["ttf"] = path

self.ttf_db = create_font_database(ttffiles, fontext="ttf")
Expand Down
31 changes: 29 additions & 2 deletions kiva/fonttools/tests/test_font_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,40 @@ def test_no_available_fonts(self):
with patch_font_cache(self.temp_dir, []):
pass

def test_default_font(self):
with change_ets_app_dir(self.temp_dir) as cache_file:
# ensure we get predictable list of system .ttf files
with patch_global_font_manager(None), \
patch_system_fonts(self.ttf_files):
font_manager = FontManager()
self.assertEqual(
font_manager.default_font["ttf"],
self.ttf_files[0],
)

# regression test for enthought/enable#930
def test_default_font_fallback_fonts(self):
with change_ets_app_dir(self.temp_dir) as cache_file:
# ensure we get empty list of system .ttf files
with patch_global_font_manager(None), patch_system_fonts([]):
with self.assertWarns(UserWarning):
font_manager = FontManager()
self.assertTrue("ttf" in font_manager.default_font)
self.assertEqual(
os.path.basename(font_manager.default_font["ttf"]),
"Montserrat-Regular.ttf",
)
self.assertTrue(
os.path.exists(font_manager.default_font["ttf"]),
)


class TestFontManager(unittest.TestCase):
""" Test API of the font manager module."""

def test_default_font_manager(self):
font_manager = default_font_manager()
self.assertIsInstance(font_manager, FontManager)
font_manager = default_font_manager()
self.assertIsInstance(font_manager, FontManager)


@contextlib.contextmanager
Expand Down