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

pep8/pyflakes

Browse Source
This commit is contained in:
hugovk 2014-05-31 17:47:59 +03:00
parent cef6a2c22c
commit 425534085d
2 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PIL/ImageFont.py
View File

@ -29,13 +29,15 @@ from __future__ import print_function
from PIL import Image from PIL import Image
from PIL._util import isDirectory, isPath from PIL._util import isDirectory, isPath
import os, sys import os
import sys
try: try:
import warnings import warnings
except ImportError: except ImportError:
warnings = None warnings = None
class _imagingft_not_installed: class _imagingft_not_installed:
# module placeholder # module placeholder
def __getattr__(self, id): def __getattr__(self, id):
@ -113,6 +115,7 @@ class ImageFont:
self.getsize = self.font.getsize self.getsize = self.font.getsize
self.getmask = self.font.getmask self.getmask = self.font.getmask
## ##
# Wrapper for FreeType fonts. Application code should use the # Wrapper for FreeType fonts. Application code should use the
# <b>truetype</b> factory function to create font objects. # <b>truetype</b> factory function to create font objects.
@ -131,7 +134,8 @@ class FreeTypeFont:
self.font = core.getfont(font, size, index, encoding) self.font = core.getfont(font, size, index, encoding)
else: else:
self.font_bytes = font.read() self.font_bytes = font.read()
self.font = core.getfont("", size, index, encoding, self.font_bytes) self.font = core.getfont(
"", size, index, encoding, self.font_bytes)
def getname(self): def getname(self):
return self.font.family, self.font.style return self.font.family, self.font.style
@ -154,6 +158,7 @@ class FreeTypeFont:
self.font.render(text, im.id, mode == "1") self.font.render(text, im.id, mode == "1")
return im, offset return im, offset
## ##
# Wrapper that creates a transposed font from any existing font # Wrapper that creates a transposed font from any existing font
# object. # object.
@ -400,7 +405,7 @@ w7IkEbzhVQAAAABJRU5ErkJggg==
if __name__ == "__main__": if __name__ == "__main__":
# create font data chunk for embedding # create font data chunk for embedding
import base64, os, sys import base64
font = "../Images/courB08" font = "../Images/courB08"
print(" f._load_pilfont_data(") print(" f._load_pilfont_data(")
print(" # %s" % os.path.basename(font)) print(" # %s" % os.path.basename(font))

17
Tests/test_imagefont.py
View File

@ -15,21 +15,26 @@ from PIL import ImageDraw
font_path = "Tests/fonts/FreeMono.ttf" font_path = "Tests/fonts/FreeMono.ttf"
font_size = 20 font_size = 20
def test_sanity(): def test_sanity():
assert_match(ImageFont.core.freetype2_version, "\d+\.\d+\.\d+$") assert_match(ImageFont.core.freetype2_version, "\d+\.\d+\.\d+$")
def test_font_with_name(): def test_font_with_name():
assert_no_exception(lambda: ImageFont.truetype(font_path, font_size)) assert_no_exception(lambda: ImageFont.truetype(font_path, font_size))
assert_no_exception(lambda: _render(font_path)) assert_no_exception(lambda: _render(font_path))
_clean() _clean()
def _font_as_bytes(): def _font_as_bytes():
with open(font_path, 'rb') as f: with open(font_path, 'rb') as f:
font_bytes = BytesIO(f.read()) font_bytes = BytesIO(f.read())
return font_bytes return font_bytes
def test_font_with_filelike(): def test_font_with_filelike():
assert_no_exception(lambda: ImageFont.truetype(_font_as_bytes(), font_size)) assert_no_exception(
lambda: ImageFont.truetype(_font_as_bytes(), font_size))
assert_no_exception(lambda: _render(_font_as_bytes())) assert_no_exception(lambda: _render(_font_as_bytes()))
# Usage note: making two fonts from the same buffer fails. # Usage note: making two fonts from the same buffer fails.
# shared_bytes = _font_as_bytes() # shared_bytes = _font_as_bytes()
@ -37,13 +42,18 @@ def test_font_with_filelike():
# assert_exception(Exception, lambda: _render(shared_bytes)) # assert_exception(Exception, lambda: _render(shared_bytes))
_clean() _clean()
def test_font_with_open_file(): def test_font_with_open_file():
with open(font_path, 'rb') as f: with open(font_path, 'rb') as f:
assert_no_exception(lambda: _render(f)) assert_no_exception(lambda: _render(f))
_clean() _clean()
def test_font_old_parameters(): def test_font_old_parameters():
assert_warning(DeprecationWarning, lambda: ImageFont.truetype(filename=font_path, size=font_size)) assert_warning(
DeprecationWarning,
lambda: ImageFont.truetype(filename=font_path, size=font_size))
def _render(font): def _render(font):
txt = "Hello World!" txt = "Hello World!"
@ -56,9 +66,11 @@ def _render(font):
img.save('font.png') img.save('font.png')
return img return img
def _clean(): def _clean():
os.unlink('font.png') os.unlink('font.png')
def test_render_equal(): def test_render_equal():
img_path = _render(font_path) img_path = _render(font_path)
with open(font_path, 'rb') as f: with open(font_path, 'rb') as f:
@ -80,7 +92,6 @@ def test_render_multiline():
draw.text((0, y), line, font=ttf) draw.text((0, y), line, font=ttf)
y += line_spacing y += line_spacing
target = 'Tests/images/multiline_text.png' target = 'Tests/images/multiline_text.png'
target_img = Image.open(target) target_img = Image.open(target)