python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-06 12:53:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added tests for font paths without extensions and for preferring ttf extensions

Browse Source
This commit is contained in:
Andrew Murray 2015-04-01 15:26:00 +11:00
parent 3e9e95b00a
commit b75ee4c5b6
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PIL/ImageFont.py
View File

@ -279,8 +279,8 @@ def truetype(font=None, size=10, index=0, encoding="", filename=None):
lindirs = '/usr/share' lindirs = '/usr/share'
dirs += [os.path.join(lindir, "fonts") for lindir in lindirs.split(":")] dirs += [os.path.join(lindir, "fonts") for lindir in lindirs.split(":")]
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
dirs += ['/Library/Fonts/', '/System/Library/Fonts/', dirs += ['/Library/Fonts', '/System/Library/Fonts',
os.path.expanduser('~/Library/Fonts/')] os.path.expanduser('~/Library/Fonts')]
ext = os.path.splitext(ttf_filename)[1] ext = os.path.splitext(ttf_filename)[1]
firstFontWithADifferentExtension = None firstFontWithADifferentExtension = None

32
Tests/test_imagefont.py
View File

@ -233,7 +233,7 @@ try:
# Assert # Assert
self.assert_image_equal(im, target_img) self.assert_image_equal(im, target_img)
def _test_fake_loading_font(self, path_to_fake): def _test_fake_loading_font(self, path_to_fake, fontname):
#Make a copy of FreeTypeFont so we can patch the original #Make a copy of FreeTypeFont so we can patch the original
free_type_font = copy.deepcopy(ImageFont.FreeTypeFont) free_type_font = copy.deepcopy(ImageFont.FreeTypeFont)
with SimplePatcher(ImageFont, '_FreeTypeFont', free_type_font): with SimplePatcher(ImageFont, '_FreeTypeFont', free_type_font):
@ -242,7 +242,7 @@ try:
return ImageFont._FreeTypeFont(FONT_PATH, size, index, encoding) return ImageFont._FreeTypeFont(FONT_PATH, size, index, encoding)
return ImageFont._FreeTypeFont(filepath, size, index, encoding) return ImageFont._FreeTypeFont(filepath, size, index, encoding)
with SimplePatcher(ImageFont, 'FreeTypeFont', loadable_font): with SimplePatcher(ImageFont, 'FreeTypeFont', loadable_font):
font = ImageFont.truetype('Arial') font = ImageFont.truetype(fontname)
#Make sure it's loaded #Make sure it's loaded
name = font.getname() name = font.getname()
self.assertEqual(('FreeMono', 'Regular'), name) self.assertEqual(('FreeMono', 'Regular'), name)
@ -252,29 +252,43 @@ try:
def test_find_linux_font(self): def test_find_linux_font(self):
#A lot of mocking here - this is more for hitting code and catching #A lot of mocking here - this is more for hitting code and catching
#syntax like errors #syntax like errors
fontDirectory = '/usr/local/share/fonts'
with SimplePatcher(sys, 'platform', 'linux'): with SimplePatcher(sys, 'platform', 'linux'):
patched_env = copy.deepcopy(os.environ) patched_env = copy.deepcopy(os.environ)
patched_env['XDG_DATA_DIRS'] = '/usr/share/:/usr/local/share/' patched_env['XDG_DATA_DIRS'] = '/usr/share/:/usr/local/share/'
with SimplePatcher(os, 'environ', patched_env): with SimplePatcher(os, 'environ', patched_env):
def fake_walker(path): def fake_walker(path):
if path == '/usr/local/share/fonts': if path == fontDirectory:
return [(path, [], ['Arial.ttf'], )] return [(path, [], ['Arial.ttf', 'Single.otf', 'Duplicate.otf', 'Duplicate.ttf'], )]
return [(path, [], ['some_random_font.ttf'], )] return [(path, [], ['some_random_font.ttf'], )]
with SimplePatcher(os, 'walk', fake_walker): with SimplePatcher(os, 'walk', fake_walker):
self._test_fake_loading_font('/usr/local/share/fonts/Arial.ttf') # Test that the font loads both with and without the extension
self._test_fake_loading_font(fontDirectory+'/Arial.ttf', 'Arial.ttf')
self._test_fake_loading_font(fontDirectory+'/Arial.ttf', 'Arial')
# Test that non-ttf fonts can be found without the extension
self._test_fake_loading_font(fontDirectory+'/Single.otf', 'Single')
# Test that ttf fonts are preferred if the extension is not specified
self._test_fake_loading_font(fontDirectory+'/Duplicate.ttf', 'Duplicate')
@unittest.skipIf(sys.platform.startswith('win32'), "requires Unix or MacOS") @unittest.skipIf(sys.platform.startswith('win32'), "requires Unix or MacOS")
def test_find_osx_font(self): def test_find_osx_font(self):
#Like the linux test, more cover hitting code rather than testing #Like the linux test, more cover hitting code rather than testing
#correctness. #correctness.
fontDirectory = '/System/Library/Fonts'
with SimplePatcher(sys, 'platform', 'darwin'): with SimplePatcher(sys, 'platform', 'darwin'):
fake_font_path = '/System/Library/Fonts/Arial.ttf'
def fake_walker(path): def fake_walker(path):
if path == '/System/Library/Fonts/': if path == fontDirectory:
return [(path, [], ['Arial.ttf'], )] return [(path, [], ['Arial.ttf', 'Single.otf', 'Duplicate.otf', 'Duplicate.ttf'], )]
return [(path, [], ['some_random_font.ttf'], )] return [(path, [], ['some_random_font.ttf'], )]
with SimplePatcher(os, 'walk', fake_walker): with SimplePatcher(os, 'walk', fake_walker):
self._test_fake_loading_font(fake_font_path) self._test_fake_loading_font(fontDirectory+'/Arial.ttf', 'Arial.ttf')
self._test_fake_loading_font(fontDirectory+'/Arial.ttf', 'Arial')
self._test_fake_loading_font(fontDirectory+'/Single.otf', 'Single')
self._test_fake_loading_font(fontDirectory+'/Duplicate.ttf', 'Duplicate')
except ImportError: except ImportError: