From c13ccf13a18e932d14d72d704cc2d37923c56949 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 6 Mar 2018 19:53:07 +1100 Subject: [PATCH] Added missing whitespace --- Tests/helper.py | 2 +- Tests/test_decompression_bomb.py | 4 +- Tests/test_file_gif.py | 2 +- Tests/test_file_jpeg.py | 2 +- Tests/test_file_tiff.py | 4 +- Tests/test_file_tiff_metadata.py | 2 +- Tests/test_font_leaks.py | 2 +- Tests/test_font_pcf.py | 10 +- Tests/test_image_transform.py | 2 +- Tests/test_imagefontctl.py | 4 +- Tests/test_lib_pack.py | 330 +++++++++++++++---------------- Tests/test_numpy.py | 2 +- setup.py | 2 +- src/PIL/Image.py | 8 +- 14 files changed, 188 insertions(+), 188 deletions(-) diff --git a/Tests/helper.py b/Tests/helper.py index ab2add282..8556ed76a 100644 --- a/Tests/helper.py +++ b/Tests/helper.py @@ -17,7 +17,7 @@ HAS_UPLOADER = False if os.environ.get('SHOW_ERRORS', None): # local img.show for errors. - HAS_UPLOADER=True + HAS_UPLOADER = True class test_image_results: @classmethod diff --git a/Tests/test_decompression_bomb.py b/Tests/test_decompression_bomb.py index ce27cea96..4e3c26377 100644 --- a/Tests/test_decompression_bomb.py +++ b/Tests/test_decompression_bomb.py @@ -30,7 +30,7 @@ class TestDecompressionBomb(PillowTestCase): def test_warning(self): # Set limit to trigger warning on the test file - Image.MAX_IMAGE_PIXELS = 128 * 128 -1 + Image.MAX_IMAGE_PIXELS = 128 * 128 - 1 self.assertEqual(Image.MAX_IMAGE_PIXELS, 128 * 128 - 1) self.assert_warning(Image.DecompressionBombWarning, @@ -38,7 +38,7 @@ class TestDecompressionBomb(PillowTestCase): def test_exception(self): # Set limit to trigger exception on the test file - Image.MAX_IMAGE_PIXELS = 64 * 128 -1 + Image.MAX_IMAGE_PIXELS = 64 * 128 - 1 self.assertEqual(Image.MAX_IMAGE_PIXELS, 64 * 128 - 1) self.assertRaises(Image.DecompressionBombError, diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py index 5dccde3ae..c8f3836fc 100644 --- a/Tests/test_file_gif.py +++ b/Tests/test_file_gif.py @@ -266,7 +266,7 @@ class TestFileGif(PillowTestCase): Image.new('L', (100, 100), '#111'), Image.new('L', (100, 100), '#222'), ] - for method in range(0,4): + for method in range(0, 4): im_list[0].save( out, save_all=True, diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index f46414370..d0b204c9e 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -141,7 +141,7 @@ class TestFileJpeg(PillowTestCase): f = self.tempfile("temp.jpg") icc_profile = im.info["icc_profile"] try: - im.save(f, format='JPEG', progressive=True,quality=95, + im.save(f, format='JPEG', progressive=True, quality=95, icc_profile=icc_profile, optimize=True) except IOError: self.fail("Failed saving image with icc larger than image size") diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 62c1c3392..334f5c96b 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -178,8 +178,8 @@ class TestFileTiff(PillowTestCase): im = Image.open('Tests/images/16bit.s.tif') im.load() self.assertEqual(im.mode, 'I') - self.assertEqual(im.getpixel((0,0)),32767) - self.assertEqual(im.getpixel((0,1)),0) + self.assertEqual(im.getpixel((0, 0)), 32767) + self.assertEqual(im.getpixel((0, 1)), 0) def test_12bit_rawmode(self): """ Are we generating the same interpretation diff --git a/Tests/test_file_tiff_metadata.py b/Tests/test_file_tiff_metadata.py index 8cc5a7882..aabedd6c8 100644 --- a/Tests/test_file_tiff_metadata.py +++ b/Tests/test_file_tiff_metadata.py @@ -242,7 +242,7 @@ class TestFileTiffMetadata(PillowTestCase): ifd = TiffImagePlugin.ImageFileDirectory_v2() # 277: ("SamplesPerPixel", SHORT, 1), - ifd._tagdata[277] = struct.pack('hh', 4,4) + ifd._tagdata[277] = struct.pack('hh', 4, 4) ifd.tagtype[277] = TiffTags.SHORT try: diff --git a/Tests/test_font_leaks.py b/Tests/test_font_leaks.py index ab02307a2..a1c40e6a9 100644 --- a/Tests/test_font_leaks.py +++ b/Tests/test_font_leaks.py @@ -11,7 +11,7 @@ class TestTTypeFontLeak(PillowLeakTestCase): mem_limit = 4096 # k def _test_font(self, font): - im = Image.new('RGB', (255,255), 'white') + im = Image.new('RGB', (255, 255), 'white') draw = ImageDraw.ImageDraw(im) self._test_leak(lambda: draw.text((0, 0), "some text "*1024, # ~10k font=font, fill="black")) diff --git a/Tests/test_font_pcf.py b/Tests/test_font_pcf.py index 875a20b20..2b344c6c2 100644 --- a/Tests/test_font_pcf.py +++ b/Tests/test_font_pcf.py @@ -46,7 +46,7 @@ class TestFontPcf(PillowTestCase): def test_draw(self): tempname = self.save_font() font = ImageFont.load(tempname) - im = Image.new("L", (130,30), "white") + im = Image.new("L", (130, 30), "white") draw = ImageDraw.Draw(im) draw.text((0, 0), message, 'black', font=font) with Image.open('Tests/images/test_draw_pbm_target.png') as target: @@ -56,17 +56,17 @@ class TestFontPcf(PillowTestCase): tempname = self.save_font() font = ImageFont.load(tempname) for i in range(255): - (dx,dy) = font.getsize(chr(i)) + (dx, dy) = font.getsize(chr(i)) self.assertEqual(dy, 20) - self.assertIn(dx, (0,10)) + self.assertIn(dx, (0, 10)) for l in range(len(message)): msg = message[:l+1] - self.assertEqual(font.getsize(msg), (len(msg)*10,20)) + self.assertEqual(font.getsize(msg), (len(msg)*10, 20)) def _test_high_characters(self, message): tempname = self.save_font() font = ImageFont.load(tempname) - im = Image.new("L", (750,30) , "white") + im = Image.new("L", (750, 30) , "white") draw = ImageDraw.Draw(im) draw.text((0, 0), message, "black", font=font) with Image.open('Tests/images/high_ascii_chars.png') as target: diff --git a/Tests/test_image_transform.py b/Tests/test_image_transform.py index 5369ed198..a3ab7805f 100644 --- a/Tests/test_image_transform.py +++ b/Tests/test_image_transform.py @@ -61,7 +61,7 @@ class TestImageTransform(PillowTestCase): Image.BILINEAR, fillcolor = 'red') - self.assertEqual(transformed.getpixel((w-1,h-1)), (255,0,0)) + self.assertEqual(transformed.getpixel((w-1, h-1)), (255, 0, 0)) def test_mesh(self): # this should be a checkerboard of halfsized hoppers in ul, lr diff --git a/Tests/test_imagefontctl.py b/Tests/test_imagefontctl.py index ac5f9c225..89f9563f3 100644 --- a/Tests/test_imagefontctl.py +++ b/Tests/test_imagefontctl.py @@ -101,7 +101,7 @@ class TestImagecomplextext(PillowTestCase): self.assert_image_similar(im, target_img, .5) liga_size = ttf.getsize('fi', features=['-liga']) - self.assertEqual(liga_size,(13,19)) + self.assertEqual(liga_size, (13, 19)) def test_kerning_features(self): ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE) @@ -120,7 +120,7 @@ class TestImagecomplextext(PillowTestCase): im = Image.new(mode='RGB', size=(300, 100)) draw = ImageDraw.Draw(im) - draw.text((0, 0), 'اللغة العربية', font=ttf, fill=500, features=['-fina','-init','-medi']) + draw.text((0, 0), 'اللغة العربية', font=ttf, fill=500, features=['-fina', '-init', '-medi']) target = 'Tests/images/test_arabictext_features.png' target_img = Image.open(target) diff --git a/Tests/test_lib_pack.py b/Tests/test_lib_pack.py index a06578460..002db2e19 100644 --- a/Tests/test_lib_pack.py +++ b/Tests/test_lib_pack.py @@ -24,26 +24,26 @@ class TestLibPack(PillowTestCase): self.assertEqual(data, im.tobytes("raw", rawmode)) def test_1(self): - self.assert_pack("1", "1", b'\x01', 0,0,0,0,0,0,0,X) - self.assert_pack("1", "1;I", b'\x01', X,X,X,X,X,X,X,0) - self.assert_pack("1", "1;R", b'\x01', X,0,0,0,0,0,0,0) - self.assert_pack("1", "1;IR", b'\x01', 0,X,X,X,X,X,X,X) + self.assert_pack("1", "1", b'\x01', 0, 0, 0, 0, 0, 0, 0, X) + self.assert_pack("1", "1;I", b'\x01', X, X, X, X, X, X, X, 0) + self.assert_pack("1", "1;R", b'\x01', X, 0, 0, 0, 0, 0, 0, 0) + self.assert_pack("1", "1;IR", b'\x01', 0, X, X, X, X, X, X, X) - self.assert_pack("1", "1", b'\xaa', X,0,X,0,X,0,X,0) - self.assert_pack("1", "1;I", b'\xaa', 0,X,0,X,0,X,0,X) - self.assert_pack("1", "1;R", b'\xaa', 0,X,0,X,0,X,0,X) - self.assert_pack("1", "1;IR", b'\xaa', X,0,X,0,X,0,X,0) + self.assert_pack("1", "1", b'\xaa', X, 0, X, 0, X, 0, X, 0) + self.assert_pack("1", "1;I", b'\xaa', 0, X, 0, X, 0, X, 0, X) + self.assert_pack("1", "1;R", b'\xaa', 0, X, 0, X, 0, X, 0, X) + self.assert_pack("1", "1;IR", b'\xaa', X, 0, X, 0, X, 0, X, 0) - self.assert_pack("1", "L", b'\xff\x00\x00\xff\x00\x00', X,0,0,X,0,0) + self.assert_pack("1", "L", b'\xff\x00\x00\xff\x00\x00', X, 0, 0, X, 0, 0) def test_L(self): - self.assert_pack("L", "L", 1, 1,2,3,4) + self.assert_pack("L", "L", 1, 1, 2, 3, 4) self.assert_pack("L", "L;16", b'\x00\xc6\x00\xaf', 198, 175) self.assert_pack("L", "L;16B", b'\xc6\x00\xaf\x00', 198, 175) def test_LA(self): - self.assert_pack("LA", "LA", 2, (1,2), (3,4), (5,6)) - self.assert_pack("LA", "LA;L", 2, (1,4), (2,5), (3,6)) + self.assert_pack("LA", "LA", 2, (1, 2), (3, 4), (5, 6)) + self.assert_pack("LA", "LA;L", 2, (1, 4), (2, 5), (3, 6)) def test_P(self): self.assert_pack("P", "P;1", b'\xe4', 1, 1, 1, 0, 0, 255, 0, 0) @@ -52,100 +52,100 @@ class TestLibPack(PillowTestCase): self.assert_pack("P", "P", 1, 1, 2, 3, 4) def test_PA(self): - self.assert_pack("PA", "PA", 2, (1,2), (3,4), (5,6)) - self.assert_pack("PA", "PA;L", 2, (1,4), (2,5), (3,6)) + self.assert_pack("PA", "PA", 2, (1, 2), (3, 4), (5, 6)) + self.assert_pack("PA", "PA;L", 2, (1, 4), (2, 5), (3, 6)) def test_RGB(self): - self.assert_pack("RGB", "RGB", 3, (1,2,3), (4,5,6), (7,8,9)) + self.assert_pack("RGB", "RGB", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9)) self.assert_pack("RGB", "RGBX", - b'\x01\x02\x03\xff\x05\x06\x07\xff', (1,2,3), (5,6,7)) + b'\x01\x02\x03\xff\x05\x06\x07\xff', (1, 2, 3), (5, 6, 7)) self.assert_pack("RGB", "XRGB", - b'\x00\x02\x03\x04\x00\x06\x07\x08', (2,3,4), (6,7,8)) - self.assert_pack("RGB", "BGR", 3, (3,2,1), (6,5,4), (9,8,7)) + b'\x00\x02\x03\x04\x00\x06\x07\x08', (2, 3, 4), (6, 7, 8)) + self.assert_pack("RGB", "BGR", 3, (3, 2, 1), (6, 5, 4), (9, 8, 7)) self.assert_pack("RGB", "BGRX", - b'\x01\x02\x03\x00\x05\x06\x07\x00', (3,2,1), (7,6,5)) + b'\x01\x02\x03\x00\x05\x06\x07\x00', (3, 2, 1), (7, 6, 5)) self.assert_pack("RGB", "XBGR", - b'\x00\x02\x03\x04\x00\x06\x07\x08', (4,3,2), (8,7,6)) - self.assert_pack("RGB", "RGB;L", 3, (1,4,7), (2,5,8), (3,6,9)) - self.assert_pack("RGB", "R", 1, (1,9,9), (2,9,9), (3,9,9)) - self.assert_pack("RGB", "G", 1, (9,1,9), (9,2,9), (9,3,9)) - self.assert_pack("RGB", "B", 1, (9,9,1), (9,9,2), (9,9,3)) + b'\x00\x02\x03\x04\x00\x06\x07\x08', (4, 3, 2), (8, 7, 6)) + self.assert_pack("RGB", "RGB;L", 3, (1, 4, 7), (2, 5, 8), (3, 6, 9)) + self.assert_pack("RGB", "R", 1, (1, 9, 9), (2, 9, 9), (3, 9, 9)) + self.assert_pack("RGB", "G", 1, (9, 1, 9), (9, 2, 9), (9, 3, 9)) + self.assert_pack("RGB", "B", 1, (9, 9, 1), (9, 9, 2), (9, 9, 3)) def test_RGBA(self): self.assert_pack("RGBA", "RGBA", 4, - (1,2,3,4), (5,6,7,8), (9,10,11,12)) + (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)) self.assert_pack("RGBA", "RGBA;L", 4, - (1,4,7,10), (2,5,8,11), (3,6,9,12)) - self.assert_pack("RGBA", "RGB", 3, (1,2,3,14), (4,5,6,15), (7,8,9,16)) - self.assert_pack("RGBA", "BGR", 3, (3,2,1,14), (6,5,4,15), (9,8,7,16)) + (1, 4, 7, 10), (2, 5, 8, 11), (3, 6, 9, 12)) + self.assert_pack("RGBA", "RGB", 3, (1, 2, 3, 14), (4, 5, 6, 15), (7, 8, 9, 16)) + self.assert_pack("RGBA", "BGR", 3, (3, 2, 1, 14), (6, 5, 4, 15), (9, 8, 7, 16)) self.assert_pack("RGBA", "BGRA", 4, - (3,2,1,4), (7,6,5,8), (11,10,9,12)) + (3, 2, 1, 4), (7, 6, 5, 8), (11, 10, 9, 12)) self.assert_pack("RGBA", "ABGR", 4, - (4,3,2,1), (8,7,6,5), (12,11,10,9)) + (4, 3, 2, 1), (8, 7, 6, 5), (12, 11, 10, 9)) self.assert_pack("RGBA", "BGRa", 4, - (191,127,63,4), (223,191,159,8), (233,212,191,12)) - self.assert_pack("RGBA", "R", 1, (1,0,8,9), (2,0,8,9), (3,0,8,0)) - self.assert_pack("RGBA", "G", 1, (6,1,8,9), (6,2,8,9), (6,3,8,9)) - self.assert_pack("RGBA", "B", 1, (6,7,1,9), (6,7,2,0), (6,7,3,9)) - self.assert_pack("RGBA", "A", 1, (6,7,0,1), (6,7,0,2), (0,7,0,3)) + (191, 127, 63, 4), (223, 191, 159, 8), (233, 212, 191, 12)) + self.assert_pack("RGBA", "R", 1, (1, 0, 8, 9), (2, 0, 8, 9), (3, 0, 8, 0)) + self.assert_pack("RGBA", "G", 1, (6, 1, 8, 9), (6, 2, 8, 9), (6, 3, 8, 9)) + self.assert_pack("RGBA", "B", 1, (6, 7, 1, 9), (6, 7, 2, 0), (6, 7, 3, 9)) + self.assert_pack("RGBA", "A", 1, (6, 7, 0, 1), (6, 7, 0, 2), (0, 7, 0, 3)) def test_RGBa(self): self.assert_pack("RGBa", "RGBa", 4, - (1,2,3,4), (5,6,7,8), (9,10,11,12)) + (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)) self.assert_pack("RGBa", "BGRa", 4, - (3,2,1,4), (7,6,5,8), (11,10,9,12)) + (3, 2, 1, 4), (7, 6, 5, 8), (11, 10, 9, 12)) self.assert_pack("RGBa", "aBGR", 4, - (4,3,2,1), (8,7,6,5), (12,11,10,9)) + (4, 3, 2, 1), (8, 7, 6, 5), (12, 11, 10, 9)) def test_RGBX(self): - self.assert_pack("RGBX", "RGBX", 4, (1,2,3,4), (5,6,7,8), (9,10,11,12)) - self.assert_pack("RGBX", "RGBX;L", 4, (1,4,7,10), (2,5,8,11), (3,6,9,12)) - self.assert_pack("RGBX", "RGB", 3, (1,2,3,X), (4,5,6,X), (7,8,9,X)) - self.assert_pack("RGBX", "BGR", 3, (3,2,1,X), (6,5,4,X), (9,8,7,X)) + self.assert_pack("RGBX", "RGBX", 4, (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)) + self.assert_pack("RGBX", "RGBX;L", 4, (1, 4, 7, 10), (2, 5, 8, 11), (3, 6, 9, 12)) + self.assert_pack("RGBX", "RGB", 3, (1, 2, 3, X), (4, 5, 6, X), (7, 8, 9, X)) + self.assert_pack("RGBX", "BGR", 3, (3, 2, 1, X), (6, 5, 4, X), (9, 8, 7, X)) self.assert_pack("RGBX", "BGRX", b'\x01\x02\x03\x00\x05\x06\x07\x00\t\n\x0b\x00', - (3,2,1,X), (7,6,5,X), (11,10,9,X)) + (3, 2, 1, X), (7, 6, 5, X), (11, 10, 9, X)) self.assert_pack("RGBX", "XBGR", b'\x00\x02\x03\x04\x00\x06\x07\x08\x00\n\x0b\x0c', - (4,3,2,X), (8,7,6,X), (12,11,10,X)) - self.assert_pack("RGBX", "R", 1, (1,0,8,9), (2,0,8,9), (3,0,8,0)) - self.assert_pack("RGBX", "G", 1, (6,1,8,9), (6,2,8,9), (6,3,8,9)) - self.assert_pack("RGBX", "B", 1, (6,7,1,9), (6,7,2,0), (6,7,3,9)) - self.assert_pack("RGBX", "X", 1, (6,7,0,1), (6,7,0,2), (0,7,0,3)) + (4, 3, 2, X), (8, 7, 6, X), (12, 11, 10, X)) + self.assert_pack("RGBX", "R", 1, (1, 0, 8, 9), (2, 0, 8, 9), (3, 0, 8, 0)) + self.assert_pack("RGBX", "G", 1, (6, 1, 8, 9), (6, 2, 8, 9), (6, 3, 8, 9)) + self.assert_pack("RGBX", "B", 1, (6, 7, 1, 9), (6, 7, 2, 0), (6, 7, 3, 9)) + self.assert_pack("RGBX", "X", 1, (6, 7, 0, 1), (6, 7, 0, 2), (0, 7, 0, 3)) def test_CMYK(self): - self.assert_pack("CMYK", "CMYK", 4, (1,2,3,4), (5,6,7,8), (9,10,11,12)) + self.assert_pack("CMYK", "CMYK", 4, (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)) self.assert_pack("CMYK", "CMYK;I", 4, - (254,253,252,251), (250,249,248,247), (246,245,244,243)) + (254, 253, 252, 251), (250, 249, 248, 247), (246, 245, 244, 243)) self.assert_pack("CMYK", "CMYK;L", 4, - (1,4,7,10), (2,5,8,11), (3,6,9,12)) - self.assert_pack("CMYK", "K", 1, (6,7,0,1), (6,7,0,2), (0,7,0,3)) + (1, 4, 7, 10), (2, 5, 8, 11), (3, 6, 9, 12)) + self.assert_pack("CMYK", "K", 1, (6, 7, 0, 1), (6, 7, 0, 2), (0, 7, 0, 3)) def test_YCbCr(self): - self.assert_pack("YCbCr", "YCbCr", 3, (1,2,3), (4,5,6), (7,8,9)) - self.assert_pack("YCbCr", "YCbCr;L", 3, (1,4,7), (2,5,8), (3,6,9)) + self.assert_pack("YCbCr", "YCbCr", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9)) + self.assert_pack("YCbCr", "YCbCr;L", 3, (1, 4, 7), (2, 5, 8), (3, 6, 9)) self.assert_pack("YCbCr", "YCbCrX", b'\x01\x02\x03\xff\x05\x06\x07\xff\t\n\x0b\xff', - (1,2,3), (5,6,7), (9,10,11)) + (1, 2, 3), (5, 6, 7), (9, 10, 11)) self.assert_pack("YCbCr", "YCbCrK", b'\x01\x02\x03\xff\x05\x06\x07\xff\t\n\x0b\xff', - (1,2,3), (5,6,7), (9,10,11)) - self.assert_pack("YCbCr", "Y", 1, (1,0,8,9), (2,0,8,9), (3,0,8,0)) - self.assert_pack("YCbCr", "Cb", 1, (6,1,8,9), (6,2,8,9), (6,3,8,9)) - self.assert_pack("YCbCr", "Cr", 1, (6,7,1,9), (6,7,2,0), (6,7,3,9)) + (1, 2, 3), (5, 6, 7), (9, 10, 11)) + self.assert_pack("YCbCr", "Y", 1, (1, 0, 8, 9), (2, 0, 8, 9), (3, 0, 8, 0)) + self.assert_pack("YCbCr", "Cb", 1, (6, 1, 8, 9), (6, 2, 8, 9), (6, 3, 8, 9)) + self.assert_pack("YCbCr", "Cr", 1, (6, 7, 1, 9), (6, 7, 2, 0), (6, 7, 3, 9)) def test_LAB(self): self.assert_pack("LAB", "LAB", 3, - (1,130,131), (4,133,134), (7,136,137)) - self.assert_pack("LAB", "L", 1, (1,9,9), (2,9,9), (3,9,9)) - self.assert_pack("LAB", "A", 1, (9,1,9), (9,2,9), (9,3,9)) - self.assert_pack("LAB", "B", 1, (9,9,1), (9,9,2), (9,9,3)) + (1, 130, 131), (4, 133, 134), (7, 136, 137)) + self.assert_pack("LAB", "L", 1, (1, 9, 9), (2, 9, 9), (3, 9, 9)) + self.assert_pack("LAB", "A", 1, (9, 1, 9), (9, 2, 9), (9, 3, 9)) + self.assert_pack("LAB", "B", 1, (9, 9, 1), (9, 9, 2), (9, 9, 3)) def test_HSV(self): - self.assert_pack("HSV", "HSV", 3, (1,2,3), (4,5,6), (7,8,9)) - self.assert_pack("HSV", "H", 1, (1,9,9), (2,9,9), (3,9,9)) - self.assert_pack("HSV", "S", 1, (9,1,9), (9,2,9), (9,3,9)) - self.assert_pack("HSV", "V", 1, (9,9,1), (9,9,2), (9,9,3)) + self.assert_pack("HSV", "HSV", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9)) + self.assert_pack("HSV", "H", 1, (1, 9, 9), (2, 9, 9), (3, 9, 9)) + self.assert_pack("HSV", "S", 1, (9, 1, 9), (9, 2, 9), (9, 3, 9)) + self.assert_pack("HSV", "V", 1, (9, 9, 1), (9, 9, 2), (9, 9, 3)) def test_I(self): self.assert_pack("I", "I;16B", 2, 0x0102, 0x0304) @@ -244,163 +244,163 @@ class TestLibUnpack(PillowTestCase): self.assert_unpack("PA", "PA;L", 2, (1, 4), (2, 5), (3, 6)) def test_RGB(self): - self.assert_unpack("RGB", "RGB", 3, (1,2,3), (4,5,6), (7,8,9)) - self.assert_unpack("RGB", "RGB;L", 3, (1,4,7), (2,5,8), (3,6,9)) - self.assert_unpack("RGB", "RGB;R", 3, (128,64,192), (32,160,96)) - self.assert_unpack("RGB", "RGB;16L", 6, (2,4,6), (8,10,12)) - self.assert_unpack("RGB", "RGB;16B", 6, (1,3,5), (7,9,11)) - self.assert_unpack("RGB", "BGR", 3, (3,2,1), (6,5,4), (9,8,7)) - self.assert_unpack("RGB", "RGB;15", 2, (8,131,0), (24,0,8)) - self.assert_unpack("RGB", "BGR;15", 2, (0,131,8), (8,0,24)) - self.assert_unpack("RGB", "RGB;16", 2, (8,64,0), (24,129,0)) - self.assert_unpack("RGB", "BGR;16", 2, (0,64,8), (0,129,24)) - self.assert_unpack("RGB", "RGB;4B", 2, (17,0,34), (51,0,68)) - self.assert_unpack("RGB", "RGBX", 4, (1,2,3), (5,6,7), (9,10,11)) - self.assert_unpack("RGB", "RGBX;L", 4, (1,4,7), (2,5,8), (3,6,9)) - self.assert_unpack("RGB", "BGRX", 4, (3,2,1), (7,6,5), (11,10,9)) - self.assert_unpack("RGB", "XRGB", 4, (2,3,4), (6,7,8), (10,11,12)) - self.assert_unpack("RGB", "XBGR", 4, (4,3,2), (8,7,6), (12,11,10)) + self.assert_unpack("RGB", "RGB", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9)) + self.assert_unpack("RGB", "RGB;L", 3, (1, 4, 7), (2, 5, 8), (3, 6, 9)) + self.assert_unpack("RGB", "RGB;R", 3, (128, 64, 192), (32, 160, 96)) + self.assert_unpack("RGB", "RGB;16L", 6, (2, 4, 6), (8, 10, 12)) + self.assert_unpack("RGB", "RGB;16B", 6, (1, 3, 5), (7, 9, 11)) + self.assert_unpack("RGB", "BGR", 3, (3, 2, 1), (6, 5, 4), (9, 8, 7)) + self.assert_unpack("RGB", "RGB;15", 2, (8, 131, 0), (24, 0, 8)) + self.assert_unpack("RGB", "BGR;15", 2, (0, 131, 8), (8, 0, 24)) + self.assert_unpack("RGB", "RGB;16", 2, (8, 64, 0), (24, 129, 0)) + self.assert_unpack("RGB", "BGR;16", 2, (0, 64, 8), (0, 129, 24)) + self.assert_unpack("RGB", "RGB;4B", 2, (17, 0, 34), (51, 0, 68)) + self.assert_unpack("RGB", "RGBX", 4, (1, 2, 3), (5, 6, 7), (9, 10, 11)) + self.assert_unpack("RGB", "RGBX;L", 4, (1, 4, 7), (2, 5, 8), (3, 6, 9)) + self.assert_unpack("RGB", "BGRX", 4, (3, 2, 1), (7, 6, 5), (11, 10, 9)) + self.assert_unpack("RGB", "XRGB", 4, (2, 3, 4), (6, 7, 8), (10, 11, 12)) + self.assert_unpack("RGB", "XBGR", 4, (4, 3, 2), (8, 7, 6), (12, 11, 10)) self.assert_unpack("RGB", "YCC;P", b'D]\x9c\x82\x1a\x91\xfaOC\xe7J\x12', # random data - (127,102,0), (192,227,0), (213,255,170), (98,255,133)) - self.assert_unpack("RGB", "R", 1, (1,0,0), (2,0,0), (3,0,0)) - self.assert_unpack("RGB", "G", 1, (0,1,0), (0,2,0), (0,3,0)) - self.assert_unpack("RGB", "B", 1, (0,0,1), (0,0,2), (0,0,3)) + (127, 102, 0), (192, 227, 0), (213, 255, 170), (98, 255, 133)) + self.assert_unpack("RGB", "R", 1, (1, 0, 0), (2, 0, 0), (3, 0, 0)) + self.assert_unpack("RGB", "G", 1, (0, 1, 0), (0, 2, 0), (0, 3, 0)) + self.assert_unpack("RGB", "B", 1, (0, 0, 1), (0, 0, 2), (0, 0, 3)) def test_RGBA(self): - self.assert_unpack("RGBA", "LA", 2, (1,1,1,2), (3,3,3,4), (5,5,5,6)) + self.assert_unpack("RGBA", "LA", 2, (1, 1, 1, 2), (3, 3, 3, 4), (5, 5, 5, 6)) self.assert_unpack("RGBA", "LA;16B", 4, - (1,1,1,3), (5,5,5,7), (9,9,9,11)) + (1, 1, 1, 3), (5, 5, 5, 7), (9, 9, 9, 11)) self.assert_unpack("RGBA", "RGBA", 4, - (1,2,3,4), (5,6,7,8), (9,10,11,12)) + (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)) self.assert_unpack("RGBA", "RGBa", 4, - (63,127,191,4), (159,191,223,8), (191,212,233,12)) + (63, 127, 191, 4), (159, 191, 223, 8), (191, 212, 233, 12)) self.assert_unpack("RGBA", "RGBa", b'\x01\x02\x03\x00\x10\x20\x30\xff', - (0,0,0,0), (16,32,48,255)) + (0, 0, 0, 0), (16, 32, 48, 255)) self.assert_unpack("RGBA", "RGBa;16L", 8, - (63,127,191,8), (159,191,223,16), (191,212,233,24)) + (63, 127, 191, 8), (159, 191, 223, 16), (191, 212, 233, 24)) self.assert_unpack("RGBA", "RGBa;16L", b'\x88\x01\x88\x02\x88\x03\x88\x00' b'\x88\x10\x88\x20\x88\x30\x88\xff', - (0,0,0,0), (16,32,48,255)) + (0, 0, 0, 0), (16, 32, 48, 255)) self.assert_unpack("RGBA", "RGBa;16B", 8, - (36,109,182,7), (153,187,221,15), (188,210,232,23)) + (36, 109, 182, 7), (153, 187, 221, 15), (188, 210, 232, 23)) self.assert_unpack("RGBA", "RGBa;16B", b'\x01\x88\x02\x88\x03\x88\x00\x88' b'\x10\x88\x20\x88\x30\x88\xff\x88', - (0,0,0,0), (16,32,48,255)) + (0, 0, 0, 0), (16, 32, 48, 255)) self.assert_unpack("RGBA", "BGRa", 4, - (191,127,63,4), (223,191,159,8), (233,212,191,12)) + (191, 127, 63, 4), (223, 191, 159, 8), (233, 212, 191, 12)) self.assert_unpack("RGBA", "BGRa", b'\x01\x02\x03\x00\x10\x20\x30\xff', - (0,0,0,0), (48,32,16,255)) + (0, 0, 0, 0), (48, 32, 16, 255)) self.assert_unpack("RGBA", "RGBA;I", 4, - (254,253,252,4), (250,249,248,8), (246,245,244,12)) + (254, 253, 252, 4), (250, 249, 248, 8), (246, 245, 244, 12)) self.assert_unpack("RGBA", "RGBA;L", 4, - (1,4,7,10), (2,5,8,11), (3,6,9,12)) - self.assert_unpack("RGBA", "RGBA;15", 2, (8,131,0,0), (24,0,8,0)) - self.assert_unpack("RGBA", "BGRA;15", 2, (0,131,8,0), (8,0,24,0)) - self.assert_unpack("RGBA", "RGBA;4B", 2, (17,0,34,0), (51,0,68,0)) - self.assert_unpack("RGBA", "RGBA;16L", 8, (2,4,6,8), (10,12,14,16)) - self.assert_unpack("RGBA", "RGBA;16B", 8, (1,3,5,7), (9,11,13,15)) + (1, 4, 7, 10), (2, 5, 8, 11), (3, 6, 9, 12)) + self.assert_unpack("RGBA", "RGBA;15", 2, (8, 131, 0, 0), (24, 0, 8, 0)) + self.assert_unpack("RGBA", "BGRA;15", 2, (0, 131, 8, 0), (8, 0, 24, 0)) + self.assert_unpack("RGBA", "RGBA;4B", 2, (17, 0, 34, 0), (51, 0, 68, 0)) + self.assert_unpack("RGBA", "RGBA;16L", 8, (2, 4, 6, 8), (10, 12, 14, 16)) + self.assert_unpack("RGBA", "RGBA;16B", 8, (1, 3, 5, 7), (9, 11, 13, 15)) self.assert_unpack("RGBA", "BGRA", 4, - (3,2,1,4), (7,6,5,8), (11,10,9,12)) + (3, 2, 1, 4), (7, 6, 5, 8), (11, 10, 9, 12)) self.assert_unpack("RGBA", "ARGB", 4, - (2,3,4,1), (6,7,8,5), (10,11,12,9)) + (2, 3, 4, 1), (6, 7, 8, 5), (10, 11, 12, 9)) self.assert_unpack("RGBA", "ABGR", 4, - (4,3,2,1), (8,7,6,5), (12,11,10,9)) + (4, 3, 2, 1), (8, 7, 6, 5), (12, 11, 10, 9)) self.assert_unpack("RGBA", "YCCA;P", b']bE\x04\xdd\xbej\xed57T\xce\xac\xce:\x11', # random data - (0,161,0,4), (255,255,255,237), (27,158,0,206), (0,118,0,17)) - self.assert_unpack("RGBA", "R", 1, (1,0,0,0), (2,0,0,0), (3,0,0,0)) - self.assert_unpack("RGBA", "G", 1, (0,1,0,0), (0,2,0,0), (0,3,0,0)) - self.assert_unpack("RGBA", "B", 1, (0,0,1,0), (0,0,2,0), (0,0,3,0)) - self.assert_unpack("RGBA", "A", 1, (0,0,0,1), (0,0,0,2), (0,0,0,3)) + (0, 161, 0, 4), (255, 255, 255, 237), (27, 158, 0, 206), (0, 118, 0, 17)) + self.assert_unpack("RGBA", "R", 1, (1, 0, 0, 0), (2, 0, 0, 0), (3, 0, 0, 0)) + self.assert_unpack("RGBA", "G", 1, (0, 1, 0, 0), (0, 2, 0, 0), (0, 3, 0, 0)) + self.assert_unpack("RGBA", "B", 1, (0, 0, 1, 0), (0, 0, 2, 0), (0, 0, 3, 0)) + self.assert_unpack("RGBA", "A", 1, (0, 0, 0, 1), (0, 0, 0, 2), (0, 0, 0, 3)) def test_RGBa(self): self.assert_unpack("RGBa", "RGBa", 4, - (1,2,3,4), (5,6,7,8), (9,10,11,12)) + (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)) self.assert_unpack("RGBa", "BGRa", 4, - (3,2,1,4), (7,6,5,8), (11,10,9,12)) + (3, 2, 1, 4), (7, 6, 5, 8), (11, 10, 9, 12)) self.assert_unpack("RGBa", "aRGB", 4, - (2,3,4,1), (6,7,8,5), (10,11,12,9)) + (2, 3, 4, 1), (6, 7, 8, 5), (10, 11, 12, 9)) self.assert_unpack("RGBa", "aBGR", 4, - (4,3,2,1), (8,7,6,5), (12,11,10,9)) + (4, 3, 2, 1), (8, 7, 6, 5), (12, 11, 10, 9)) def test_RGBX(self): - self.assert_unpack("RGBX", "RGB", 3, (1,2,3,X), (4,5,6,X), (7,8,9,X)) - self.assert_unpack("RGBX", "RGB;L", 3, (1,4,7,X), (2,5,8,X), (3,6,9,X)) - self.assert_unpack("RGBX", "RGB;16B", 6, (1,3,5,X), (7,9,11,X)) - self.assert_unpack("RGBX", "BGR", 3, (3,2,1,X), (6,5,4,X), (9,8,7,X)) - self.assert_unpack("RGBX", "RGB;15", 2, (8,131,0,X), (24,0,8,X)) - self.assert_unpack("RGBX", "BGR;15", 2, (0,131,8,X), (8,0,24,X)) - self.assert_unpack("RGBX", "RGB;4B", 2, (17,0,34,X), (51,0,68,X)) + self.assert_unpack("RGBX", "RGB", 3, (1, 2, 3, X), (4, 5, 6, X), (7, 8, 9, X)) + self.assert_unpack("RGBX", "RGB;L", 3, (1, 4, 7, X), (2, 5, 8, X), (3, 6, 9, X)) + self.assert_unpack("RGBX", "RGB;16B", 6, (1, 3, 5, X), (7, 9, 11, X)) + self.assert_unpack("RGBX", "BGR", 3, (3, 2, 1, X), (6, 5, 4, X), (9, 8, 7, X)) + self.assert_unpack("RGBX", "RGB;15", 2, (8, 131, 0, X), (24, 0, 8, X)) + self.assert_unpack("RGBX", "BGR;15", 2, (0, 131, 8, X), (8, 0, 24, X)) + self.assert_unpack("RGBX", "RGB;4B", 2, (17, 0, 34, X), (51, 0, 68, X)) self.assert_unpack("RGBX", "RGBX", 4, - (1,2,3,4), (5,6,7,8), (9,10,11,12)) + (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)) self.assert_unpack("RGBX", "RGBXX", 5, - (1,2,3,4), (6,7,8,9), (11,12,13,14)) + (1, 2, 3, 4), (6, 7, 8, 9), (11, 12, 13, 14)) self.assert_unpack("RGBX", "RGBXXX", 6, - (1,2,3,4), (7,8,9,10), (13,14,15,16)) + (1, 2, 3, 4), (7, 8, 9, 10), (13, 14, 15, 16)) self.assert_unpack("RGBX", "RGBX;L", 4, - (1,4,7,10), (2,5,8,11), (3,6,9,12)) - self.assert_unpack("RGBX", "RGBX;16L", 8, (2,4,6,8), (10,12,14,16)) - self.assert_unpack("RGBX", "RGBX;16B", 8, (1,3,5,7), (9,11,13,15)) - self.assert_unpack("RGBX", "BGRX", 4, (3,2,1,X), (7,6,5,X), (11,10,9,X)) - self.assert_unpack("RGBX", "XRGB", 4, (2,3,4,X), (6,7,8,X), (10,11,12,X)) - self.assert_unpack("RGBX", "XBGR", 4, (4,3,2,X), (8,7,6,X), (12,11,10,X)) + (1, 4, 7, 10), (2, 5, 8, 11), (3, 6, 9, 12)) + self.assert_unpack("RGBX", "RGBX;16L", 8, (2, 4, 6, 8), (10, 12, 14, 16)) + self.assert_unpack("RGBX", "RGBX;16B", 8, (1, 3, 5, 7), (9, 11, 13, 15)) + self.assert_unpack("RGBX", "BGRX", 4, (3, 2, 1, X), (7, 6, 5, X), (11, 10, 9, X)) + self.assert_unpack("RGBX", "XRGB", 4, (2, 3, 4, X), (6, 7, 8, X), (10, 11, 12, X)) + self.assert_unpack("RGBX", "XBGR", 4, (4, 3, 2, X), (8, 7, 6, X), (12, 11, 10, X)) self.assert_unpack("RGBX", "YCC;P", b'D]\x9c\x82\x1a\x91\xfaOC\xe7J\x12', # random data - (127,102,0,X), (192,227,0,X), (213,255,170,X), (98,255,133,X)) - self.assert_unpack("RGBX", "R", 1, (1,0,0,0), (2,0,0,0), (3,0,0,0)) - self.assert_unpack("RGBX", "G", 1, (0,1,0,0), (0,2,0,0), (0,3,0,0)) - self.assert_unpack("RGBX", "B", 1, (0,0,1,0), (0,0,2,0), (0,0,3,0)) - self.assert_unpack("RGBX", "X", 1, (0,0,0,1), (0,0,0,2), (0,0,0,3)) + (127, 102, 0, X), (192, 227, 0, X), (213, 255, 170, X), (98, 255, 133, X)) + self.assert_unpack("RGBX", "R", 1, (1, 0, 0, 0), (2, 0, 0, 0), (3, 0, 0, 0)) + self.assert_unpack("RGBX", "G", 1, (0, 1, 0, 0), (0, 2, 0, 0), (0, 3, 0, 0)) + self.assert_unpack("RGBX", "B", 1, (0, 0, 1, 0), (0, 0, 2, 0), (0, 0, 3, 0)) + self.assert_unpack("RGBX", "X", 1, (0, 0, 0, 1), (0, 0, 0, 2), (0, 0, 0, 3)) def test_CMYK(self): self.assert_unpack("CMYK", "CMYK", 4, - (1,2,3,4), (5,6,7,8), (9,10,11,12)) + (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)) self.assert_unpack("CMYK", "CMYKX", 5, - (1,2,3,4), (6,7,8,9), (11,12,13,14)) + (1, 2, 3, 4), (6, 7, 8, 9), (11, 12, 13, 14)) self.assert_unpack("CMYK", "CMYKXX", 6, - (1,2,3,4), (7,8,9,10), (13,14,15,16)) + (1, 2, 3, 4), (7, 8, 9, 10), (13, 14, 15, 16)) self.assert_unpack("CMYK", "CMYK;I", 4, - (254,253,252,251), (250,249,248,247), (246,245,244,243)) + (254, 253, 252, 251), (250, 249, 248, 247), (246, 245, 244, 243)) self.assert_unpack("CMYK", "CMYK;L", 4, - (1,4,7,10), (2,5,8,11), (3,6,9,12)) - self.assert_unpack("CMYK", "C", 1, (1,0,0,0), (2,0,0,0), (3,0,0,0)) - self.assert_unpack("CMYK", "M", 1, (0,1,0,0), (0,2,0,0), (0,3,0,0)) - self.assert_unpack("CMYK", "Y", 1, (0,0,1,0), (0,0,2,0), (0,0,3,0)) - self.assert_unpack("CMYK", "K", 1, (0,0,0,1), (0,0,0,2), (0,0,0,3)) + (1, 4, 7, 10), (2, 5, 8, 11), (3, 6, 9, 12)) + self.assert_unpack("CMYK", "C", 1, (1, 0, 0, 0), (2, 0, 0, 0), (3, 0, 0, 0)) + self.assert_unpack("CMYK", "M", 1, (0, 1, 0, 0), (0, 2, 0, 0), (0, 3, 0, 0)) + self.assert_unpack("CMYK", "Y", 1, (0, 0, 1, 0), (0, 0, 2, 0), (0, 0, 3, 0)) + self.assert_unpack("CMYK", "K", 1, (0, 0, 0, 1), (0, 0, 0, 2), (0, 0, 0, 3)) self.assert_unpack("CMYK", "C;I", 1, - (254,0,0,0), (253,0,0,0), (252,0,0,0)) + (254, 0, 0, 0), (253, 0, 0, 0), (252, 0, 0, 0)) self.assert_unpack("CMYK", "M;I", 1, - (0,254,0,0), (0,253,0,0), (0,252,0,0)) + (0, 254, 0, 0), (0, 253, 0, 0), (0, 252, 0, 0)) self.assert_unpack("CMYK", "Y;I", 1, - (0,0,254,0), (0,0,253,0), (0,0,252,0)) + (0, 0, 254, 0), (0, 0, 253, 0), (0, 0, 252, 0)) self.assert_unpack("CMYK", "K;I", 1, - (0,0,0,254), (0,0,0,253), (0,0,0,252)) + (0, 0, 0, 254), (0, 0, 0, 253), (0, 0, 0, 252)) def test_YCbCr(self): - self.assert_unpack("YCbCr", "YCbCr", 3, (1,2,3), (4,5,6), (7,8,9)) - self.assert_unpack("YCbCr", "YCbCr;L", 3, (1,4,7), (2,5,8), (3,6,9)) - self.assert_unpack("YCbCr", "YCbCrK", 4, (1,2,3), (5,6,7), (9,10,11)) - self.assert_unpack("YCbCr", "YCbCrX", 4, (1,2,3), (5,6,7), (9,10,11)) - self.assert_unpack("YCbCr", "YCbCrXX", 5, (1,2,3), (6,7,8), (11,12,13)) - self.assert_unpack("YCbCr", "YCbCrXXX", 6, (1,2,3), (7,8,9), (13,14,15)) + self.assert_unpack("YCbCr", "YCbCr", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9)) + self.assert_unpack("YCbCr", "YCbCr;L", 3, (1, 4, 7), (2, 5, 8), (3, 6, 9)) + self.assert_unpack("YCbCr", "YCbCrK", 4, (1, 2, 3), (5, 6, 7), (9, 10, 11)) + self.assert_unpack("YCbCr", "YCbCrX", 4, (1, 2, 3), (5, 6, 7), (9, 10, 11)) + self.assert_unpack("YCbCr", "YCbCrXX", 5, (1, 2, 3), (6, 7, 8), (11, 12, 13)) + self.assert_unpack("YCbCr", "YCbCrXXX", 6, (1, 2, 3), (7, 8, 9), (13, 14, 15)) def test_LAB(self): self.assert_unpack("LAB", "LAB", 3, - (1,130,131), (4,133,134), (7,136,137)) - self.assert_unpack("LAB", "L", 1, (1,0,0), (2,0,0), (3,0,0)) - self.assert_unpack("LAB", "A", 1, (0,1,0), (0,2,0), (0,3,0)) - self.assert_unpack("LAB", "B", 1, (0,0,1), (0,0,2), (0,0,3)) + (1, 130, 131), (4, 133, 134), (7, 136, 137)) + self.assert_unpack("LAB", "L", 1, (1, 0, 0), (2, 0, 0), (3, 0, 0)) + self.assert_unpack("LAB", "A", 1, (0, 1, 0), (0, 2, 0), (0, 3, 0)) + self.assert_unpack("LAB", "B", 1, (0, 0, 1), (0, 0, 2), (0, 0, 3)) def test_HSV(self): - self.assert_unpack("HSV", "HSV", 3, (1,2,3), (4,5,6), (7,8,9)) - self.assert_unpack("HSV", "H", 1, (1,0,0), (2,0,0), (3,0,0)) - self.assert_unpack("HSV", "S", 1, (0,1,0), (0,2,0), (0,3,0)) - self.assert_unpack("HSV", "V", 1, (0,0,1), (0,0,2), (0,0,3)) + self.assert_unpack("HSV", "HSV", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9)) + self.assert_unpack("HSV", "H", 1, (1, 0, 0), (2, 0, 0), (3, 0, 0)) + self.assert_unpack("HSV", "S", 1, (0, 1, 0), (0, 2, 0), (0, 3, 0)) + self.assert_unpack("HSV", "V", 1, (0, 0, 1), (0, 0, 2), (0, 0, 3)) def test_I(self): self.assert_unpack("I", "I;8", 1, 0x01, 0x02, 0x03, 0x04) diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py index 7eeee3a83..3f9586513 100644 --- a/Tests/test_numpy.py +++ b/Tests/test_numpy.py @@ -214,7 +214,7 @@ class TestNumpy(PillowTestCase): def test_bool(self): # https://github.com/python-pillow/Pillow/issues/2044 - a = numpy.zeros((10,2), dtype=numpy.bool) + a = numpy.zeros((10, 2), dtype=numpy.bool) a[0][0] = True im2 = Image.fromarray(a) diff --git a/setup.py b/setup.py index e75105d82..4a0ad86c5 100755 --- a/setup.py +++ b/setup.py @@ -788,7 +788,7 @@ try: setup_requires=pytest_runner, tests_require=['pytest'], packages=["PIL"], - package_dir={'':'src'}, + package_dir={'': 'src'}, keywords=["Imaging", ], license='Standard PIL License', zip_safe=not (debug_build() or PLATFORM_MINGW), ) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index fd47a0c1c..0fc0b5e87 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1407,7 +1407,7 @@ class Image(object): else: self.im.paste(im, box) - def alpha_composite(self, im, dest=(0,0), source=(0,0)): + def alpha_composite(self, im, dest=(0, 0), source=(0, 0)): """ 'In-place' analog of Image.alpha_composite. Composites an image onto this image. @@ -1438,7 +1438,7 @@ class Image(object): source = source + im.size # over image, crop if it's not the whole thing. - if source == (0,0) + im.size: + if source == (0, 0) + im.size: overlay = im else: overlay = im.crop(source) @@ -1447,7 +1447,7 @@ class Image(object): box = dest + (dest[0] + overlay.width, dest[1] + overlay.height) # destination image. don't copy if we're using the whole image. - if box == (0,0) + self.size: + if box == (0, 0) + self.size: background = self else: background = self.crop(box) @@ -2501,7 +2501,7 @@ def _decompression_bomb_check(size): raise DecompressionBombError( "Image size (%d pixels) exceeds limit of %d pixels, " "could be decompression bomb DOS attack." % - (pixels, 2* MAX_IMAGE_PIXELS)) + (pixels, 2 * MAX_IMAGE_PIXELS)) if pixels > MAX_IMAGE_PIXELS: warnings.warn(