python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-25 09:26:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Flake8 fixes

Browse Source
This commit is contained in:
Andrew Murray 2015-12-31 07:27:27 +11:00
parent 9ba3799980
commit a83bcec169
6 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PIL/BmpImagePlugin.py
View File

@ -130,9 +130,10 @@ class BmpImageFile(ImageFile.ImageFile):
# ----------------- Process BMP with Bitfields compression (not palette) # ----------------- Process BMP with Bitfields compression (not palette)
if file_info['compression'] == self.BITFIELDS: if file_info['compression'] == self.BITFIELDS:
SUPPORTED = { SUPPORTED = {
32: [(0xff0000, 0xff00, 0xff, 0x0), (0xff0000, 0xff00, 0xff, 0xff000000), (0x0, 0x0, 0x0, 0x0)], 32: [(0xff0000, 0xff00, 0xff, 0x0), (0xff0000, 0xff00, 0xff, 0xff000000), (0x0, 0x0, 0x0, 0x0)],
24: [(0xff0000, 0xff00, 0xff)], 24: [(0xff0000, 0xff00, 0xff)],
16: [(0xf800, 0x7e0, 0x1f), (0x7c00, 0x3e0, 0x1f)]} 16: [(0xf800, 0x7e0, 0x1f), (0x7c00, 0x3e0, 0x1f)]
}
MASK_MODES = { MASK_MODES = {
(32, (0xff0000, 0xff00, 0xff, 0x0)): "BGRX", (32, (0xff0000, 0xff00, 0xff, 0x0)): "BGRX",
(32, (0xff0000, 0xff00, 0xff, 0xff000000)): "BGRA", (32, (0xff0000, 0xff00, 0xff, 0xff000000)): "BGRA",

2
PIL/JpegImagePlugin.py
View File

@ -434,7 +434,7 @@ def _getexif(self):
else: else:
info = TiffImagePlugin.ImageFileDirectory_v1(head) info = TiffImagePlugin.ImageFileDirectory_v1(head)
info.load(file) info.load(file)
exif[0x8825] = dict([(k,v[0]) if len(v) == 1 else (k,v) for k,v in info.items()]) exif[0x8825] = dict([(k, v[0]) if len(v) == 1 else (k, v) for k, v in info.items()])
return exif return exif

4
Tests/test_file_jpeg.py
View File

@ -320,8 +320,8 @@ class TestFileJpeg(PillowTestCase):
# dict of qtable lists # dict of qtable lists
self.assert_image_similar(im, self.assert_image_similar(im,
self.roundtrip(im, qtables={ self.roundtrip(im, qtables={
0: standard_l_qtable, 0: standard_l_qtable,
1: standard_chrominance_qtable 1: standard_chrominance_qtable
}), 30) }), 30)
# not a sequence # not a sequence

2
Tests/test_file_libtiff.py
View File

@ -170,7 +170,7 @@ class TestFileLibTiff(LibTiffTestCase):
'RowsPerStrip', 'RowsPerStrip',
'StripOffsets'] 'StripOffsets']
for field in requested_fields: for field in requested_fields:
self.assertTrue(field in reloaded, "%s not in metadata" %field) self.assertTrue(field in reloaded, "%s not in metadata" % field)
def test_g3_compression(self): def test_g3_compression(self):
i = Image.open('Tests/images/hopper_g4_500.tif') i = Image.open('Tests/images/hopper_g4_500.tif')

20
Tests/test_file_tiff.py
View File

@ -113,7 +113,7 @@ class TestFileTiff(PillowTestCase):
self.assert_warning(UserWarning, i._getexif) self.assert_warning(UserWarning, i._getexif)
except struct.error: except struct.error:
self.fail( self.fail(
"Bad EXIF data passed incorrect values to _binary unpack") "Bad EXIF data passed incorrect values to _binary unpack")
def test_save_rgba(self): def test_save_rgba(self):
im = hopper("RGBA") im = hopper("RGBA")
@ -245,18 +245,18 @@ class TestFileTiff(PillowTestCase):
im = Image.open(filename) im = Image.open(filename)
# v2 interface # v2 interface
self.assertEqual( self.assertEqual(
im.tag_v2.as_dict(), im.tag_v2.as_dict(),
{256: 55, 257: 43, 258: (8, 8, 8, 8), 259: 1, {256: 55, 257: 43, 258: (8, 8, 8, 8), 259: 1,
262: 2, 296: 2, 273: (8,), 338: (1,), 277: 4, 262: 2, 296: 2, 273: (8,), 338: (1,), 277: 4,
279: (9460,), 282: 72.0, 283: 72.0, 284: 1}) 279: (9460,), 282: 72.0, 283: 72.0, 284: 1})
# legacy interface # legacy interface
self.assertEqual( self.assertEqual(
im.tag.as_dict(), im.tag.as_dict(),
{256: (55,), 257: (43,), 258: (8, 8, 8, 8), 259: (1,), {256: (55,), 257: (43,), 258: (8, 8, 8, 8), 259: (1,),
262: (2,), 296: (2,), 273: (8,), 338: (1,), 277: (4,), 262: (2,), 296: (2,), 273: (8,), 338: (1,), 277: (4,),
279: (9460,), 282: ((720000, 10000),), 279: (9460,), 282: ((720000, 10000),),
283: ((720000, 10000),), 284: (1,)}) 283: ((720000, 10000),), 284: (1,)})
def test__delitem__(self): def test__delitem__(self):
filename = "Tests/images/pil136.tiff" filename = "Tests/images/pil136.tiff"

10
Tests/test_imagefont_bitmap.py
View File

@ -14,14 +14,16 @@ class TestImageFontBitmap(PillowTestCase):
def test_similar(self): def test_similar(self):
text = 'EmbeddedBitmap' text = 'EmbeddedBitmap'
font_outline = ImageFont.truetype( font_outline = ImageFont.truetype(
font='Tests/fonts/DejaVuSans.ttf', size=24) font='Tests/fonts/DejaVuSans.ttf', size=24)
font_bitmap = ImageFont.truetype( font_bitmap = ImageFont.truetype(
font='Tests/fonts/DejaVuSans-bitmap.ttf', size=24) font='Tests/fonts/DejaVuSans-bitmap.ttf', size=24)
size_outline, size_bitmap = font_outline.getsize(text), font_bitmap.getsize(text) size_outline = font_outline.getsize(text)
size_bitmap = font_bitmap.getsize(text)
size_final = max(size_outline[0], size_bitmap[0]), max(size_outline[1], size_bitmap[1]) size_final = max(size_outline[0], size_bitmap[0]), max(size_outline[1], size_bitmap[1])
im_bitmap = Image.new('RGB', size_final, (255, 255, 255)) im_bitmap = Image.new('RGB', size_final, (255, 255, 255))
im_outline = im_bitmap.copy() im_outline = im_bitmap.copy()
draw_bitmap, draw_outline = ImageDraw.Draw(im_bitmap), ImageDraw.Draw(im_outline) draw_bitmap = ImageDraw.Draw(im_bitmap)
draw_outline = ImageDraw.Draw(im_outline)
# Metrics are different on the bitmap and ttf fonts, # Metrics are different on the bitmap and ttf fonts,
# more so on some platforms and versions of freetype than others. # more so on some platforms and versions of freetype than others.