Various Flake8 fixes

Tests/check_imaging_leaks.py

@@ -31,7 +31,8 @@ class TestImagingLeaks(PillowTestCase):
 
     def test_leak_putdata(self):
         im = Image.new('RGB', (25, 25))
-        self._test_leak(min_iterations, max_iterations, im.putdata, im.getdata())
+        self._test_leak(min_iterations, max_iterations,
+                        im.putdata, im.getdata())
 
     def test_leak_getlist(self):
         im = Image.new('P', (25, 25))

Tests/check_png_dos.py

@@ -42,7 +42,8 @@ class TestPngDos(PillowTestCase):
         total_len = 0
         for txt in im2.text.values():
             total_len += len(txt)
-        self.assertLess(total_len, 64*1024*1024, "Total text chunks greater than 64M")
+        self.assertLess(total_len, 64*1024*1024,
+                        "Total text chunks greater than 64M")
 
 if __name__ == '__main__':
     unittest.main()

Tests/test_file_bmp.py

@@ -27,7 +27,8 @@ class TestFileBmp(PillowTestCase):
 
     def test_invalid_file(self):
         with open("Tests/images/flower.jpg", "rb") as fp:
-            self.assertRaises(SyntaxError, lambda: BmpImagePlugin.BmpImageFile(fp))
+            self.assertRaises(SyntaxError,
+                              lambda: BmpImagePlugin.BmpImageFile(fp))
 
     def test_save_to_bytes(self):
         output = io.BytesIO()

Tests/test_file_bufrstub.py

@@ -6,7 +6,11 @@ from PIL import BufrStubImagePlugin
 class TestFileBufrStub(PillowTestCase):
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: BufrStubImagePlugin.BufrStubImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda:
+                          BufrStubImagePlugin.BufrStubImageFile(invalid_file))
 
 
 if __name__ == '__main__':

Tests/test_file_cur.py

@@ -21,7 +21,10 @@ class TestFileCur(PillowTestCase):
         self.assertEqual(im.getpixel((16, 16)), (84, 87, 86, 255))
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: CurImagePlugin.CurImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: CurImagePlugin.CurImageFile(invalid_file))
 
 
 if __name__ == '__main__':

Tests/test_file_dcx.py

@@ -22,7 +22,8 @@ class TestFileDcx(PillowTestCase):
 
     def test_invalid_file(self):
         with open("Tests/images/flower.jpg", "rb") as fp:
-            self.assertRaises(SyntaxError, lambda: DcxImagePlugin.DcxImageFile(fp))
+            self.assertRaises(SyntaxError,
+                              lambda: DcxImagePlugin.DcxImageFile(fp))
 
     def test_tell(self):
         # Arrange

Tests/test_file_eps.py

@@ -52,7 +52,10 @@ class TestFileEps(PillowTestCase):
         self.assertEqual(image2_scale2.format, "EPS")
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: EpsImagePlugin.EpsImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: EpsImagePlugin.EpsImageFile(invalid_file))
 
     def test_file_object(self):
         # issue 479
@@ -152,7 +155,9 @@ class TestFileEps(PillowTestCase):
         Image.open(file3)
 
     def _test_readline(self, t, ending):
-        ending = "Failure with line ending: %s" % ("".join("%s" % ord(s) for s in ending))
+        ending = "Failure with line ending: %s" % ("".join(
+                                                   "%s" % ord(s)
+                                                   for s in ending))
         self.assertEqual(t.readline().strip('\r\n'), 'something', ending)
         self.assertEqual(t.readline().strip('\r\n'), 'else', ending)
         self.assertEqual(t.readline().strip('\r\n'), 'baz', ending)

Tests/test_file_fitsstub.py

@@ -6,7 +6,11 @@ from PIL import FitsStubImagePlugin
 class TestFileFitsStub(PillowTestCase):
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: FitsStubImagePlugin.FITSStubImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda:
+                          FitsStubImagePlugin.FITSStubImageFile(invalid_file))
 
 
 if __name__ == '__main__':

Tests/test_file_fli.py

@@ -19,7 +19,10 @@ class TestFileFli(PillowTestCase):
         self.assertEqual(im.format, "FLI")
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: FliImagePlugin.FliImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: FliImagePlugin.FliImageFile(invalid_file))
 
     def test_n_frames(self):
         im = Image.open(test_file)

Tests/test_file_fpx.py

@@ -6,7 +6,10 @@ from PIL import FpxImagePlugin
 class TestFileFpx(PillowTestCase):
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: FpxImagePlugin.FpxImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: FpxImagePlugin.FpxImageFile(invalid_file))
 
 
 if __name__ == '__main__':

Tests/test_file_gbr.py

@@ -6,7 +6,10 @@ from PIL import GbrImagePlugin
 class TestFileGbr(PillowTestCase):
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: GbrImagePlugin.GbrImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: GbrImagePlugin.GbrImageFile(invalid_file))
 
 
 if __name__ == '__main__':

Tests/test_file_gif.py

@@ -26,7 +26,10 @@ class TestFileGif(PillowTestCase):
         self.assertEqual(im.format, "GIF")
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: GifImagePlugin.GifImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: GifImagePlugin.GifImageFile(invalid_file))
 
     def test_optimize(self):
         from io import BytesIO

Tests/test_file_gribstub.py

@@ -6,7 +6,11 @@ from PIL import GribStubImagePlugin
 class TestFileGribStub(PillowTestCase):
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: GribStubImagePlugin.GribStubImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda:
+                          GribStubImagePlugin.GribStubImageFile(invalid_file))
 
 
 if __name__ == '__main__':

Tests/test_file_hdf5stub.py

@@ -6,7 +6,11 @@ from PIL import Hdf5StubImagePlugin
 class TestFileHdf5Stub(PillowTestCase):
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: Hdf5StubImagePlugin.HDF5StubImageFile("Tests/images/flower.jpg"))
+        test_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda:
+                          Hdf5StubImagePlugin.HDF5StubImageFile(test_file))
 
 
 if __name__ == '__main__':

Tests/test_file_ico.py

@@ -19,7 +19,8 @@ class TestFileIco(PillowTestCase):
 
     def test_invalid_file(self):
         with open("Tests/images/flower.jpg", "rb") as fp:
-            self.assertRaises(SyntaxError, lambda: IcoImagePlugin.IcoImageFile(fp))
+            self.assertRaises(SyntaxError,
+                              lambda: IcoImagePlugin.IcoImageFile(fp))
 
     def test_save_to_bytes(self):
         output = io.BytesIO()
@@ -34,7 +35,8 @@ class TestFileIco(PillowTestCase):
         self.assertEqual(im.mode, reloaded.mode)
         self.assertEqual((64, 64), reloaded.size)
         self.assertEqual(reloaded.format, "ICO")
-        self.assert_image_equal(reloaded, hopper().resize((64, 64), Image.LANCZOS))
+        self.assert_image_equal(reloaded,
+                                hopper().resize((64, 64), Image.LANCZOS))
 
         # the other one
         output.seek(0)
@@ -44,7 +46,8 @@ class TestFileIco(PillowTestCase):
         self.assertEqual(im.mode, reloaded.mode)
         self.assertEqual((32, 32), reloaded.size)
         self.assertEqual(reloaded.format, "ICO")
-        self.assert_image_equal(reloaded, hopper().resize((32, 32), Image.LANCZOS))
+        self.assert_image_equal(reloaded,
+                                hopper().resize((32, 32), Image.LANCZOS))
 
 
 if __name__ == '__main__':

Tests/test_file_im.py

@@ -41,7 +41,10 @@ class TestFileIm(PillowTestCase):
         self.assert_image_equal(reread, im)
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: ImImagePlugin.ImImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: ImImagePlugin.ImImageFile(invalid_file))
 
 
 if __name__ == '__main__':

Tests/test_file_jpeg.py

@@ -291,22 +291,24 @@ class TestFileJpeg(PillowTestCase):
 
         # dict of qtable lists
         self.assert_image_similar(im,
-                                  self.roundtrip(im,
+                                  self.roundtrip(im, qtables={
-                                                 qtables={0: standard_l_qtable,
+                                    0: standard_l_qtable,
-                                                          1: standard_chrominance_qtable}),
+                                    1: standard_chrominance_qtable
-                                  30)
+                                  }), 30)
 
         # not a sequence
         self.assertRaises(Exception, lambda: self.roundtrip(im, qtables='a'))
         # sequence wrong length
         self.assertRaises(Exception, lambda: self.roundtrip(im, qtables=[]))
         # sequence wrong length
-        self.assertRaises(Exception, lambda: self.roundtrip(im, qtables=[1, 2, 3, 4, 5]))
+        self.assertRaises(Exception,
+                          lambda: self.roundtrip(im, qtables=[1, 2, 3, 4, 5]))
 
         # qtable entry not a sequence
         self.assertRaises(Exception, lambda: self.roundtrip(im, qtables=[1]))
         # qtable entry has wrong number of items
-        self.assertRaises(Exception, lambda: self.roundtrip(im, qtables=[[1, 2, 3, 4]]))
+        self.assertRaises(Exception,
+                          lambda: self.roundtrip(im, qtables=[[1, 2, 3, 4]]))
 
     @unittest.skipUnless(djpeg_available(), "djpeg not available")
     def test_load_djpeg(self):
@@ -337,7 +339,8 @@ class TestFileJpeg(PillowTestCase):
             """ Generates a very hard to compress file
             :param size: tuple
             """
-            return Image.frombytes('RGB', size, os.urandom(size[0]*size[1] * 3))
+            return Image.frombytes('RGB',
+                                   size, os.urandom(size[0]*size[1] * 3))
 
         im = gen_random_image((512, 512))
         f = self.tempfile("temp.jpeg")

Tests/test_file_jpeg2k.py

@@ -40,7 +40,11 @@ class TestFileJpeg2k(PillowTestCase):
         self.assertEqual(im.format, 'JPEG2000')
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: Jpeg2KImagePlugin.Jpeg2KImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda:
+                          Jpeg2KImagePlugin.Jpeg2KImageFile(invalid_file))
 
     def test_bytesio(self):
         with open('Tests/images/test-card-lossless.jp2', 'rb') as f:

Tests/test_file_mcidas.py

@@ -6,7 +6,11 @@ from PIL import McIdasImagePlugin
 class TestFileMcIdas(PillowTestCase):
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: McIdasImagePlugin.McIdasImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda:
+                          McIdasImagePlugin.McIdasImageFile(invalid_file))
 
 
 if __name__ == '__main__':

Tests/test_file_mic.py

@@ -6,7 +6,10 @@ from PIL import MicImagePlugin
 class TestFileMic(PillowTestCase):
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: MicImagePlugin.MicImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: MicImagePlugin.MicImageFile(invalid_file))
 
 
 if __name__ == '__main__':

Tests/test_file_msp.py

@@ -19,7 +19,10 @@ class TestFileMsp(PillowTestCase):
         self.assertEqual(im.format, "MSP")
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: MspImagePlugin.MspImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: MspImagePlugin.MspImageFile(invalid_file))
 
     def test_open(self):
         # Arrange

Tests/test_file_pcx.py

@@ -20,7 +20,10 @@ class TestFilePcx(PillowTestCase):
             self._roundtrip(hopper(mode))
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: PcxImagePlugin.PcxImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: PcxImagePlugin.PcxImageFile(invalid_file))
 
     def test_odd(self):
         # see issue #523, odd sized images should have a stride that's even.

Tests/test_file_png.py

@@ -82,7 +82,10 @@ class TestFilePng(PillowTestCase):
         im = Image.open(test_file)
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: PngImagePlugin.PngImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: PngImagePlugin.PngImageFile(invalid_file))
 
     def test_broken(self):
         # Check reading of totally broken files.  In this case, the test

Tests/test_file_psd.py

@@ -17,7 +17,10 @@ class TestImagePsd(PillowTestCase):
         self.assertEqual(im.format, "PSD")
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: PsdImagePlugin.PsdImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: PsdImagePlugin.PsdImageFile(invalid_file))
 
     def test_n_frames(self):
         im = Image.open("Tests/images/hopper_merged.psd")

Tests/test_file_sgi.py

@@ -33,7 +33,11 @@ class TestFileSgi(PillowTestCase):
         self.assertRaises(ValueError, lambda: Image.open(test_file))
 
     def test_invalid_file(self):
-        self.assertRaises(ValueError, lambda: SgiImagePlugin.SgiImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(ValueError,
+                          lambda:
+                          SgiImagePlugin.SgiImageFile(invalid_file))
 
 
 if __name__ == '__main__':

Tests/test_file_sun.py

@@ -16,7 +16,9 @@ class TestFileSun(PillowTestCase):
         # Assert
         self.assertEqual(im.size, (128, 128))
 
-        self.assertRaises(SyntaxError, lambda: SunImagePlugin.SunImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+        self.assertRaises(SyntaxError,
+                          lambda: SunImagePlugin.SunImageFile(invalid_file))
 
 
 if __name__ == '__main__':

Tests/test_file_tiff.py

@@ -86,7 +86,8 @@ class TestFileTiff(PillowTestCase):
         try:
             Image.open('Tests/images/hopper_bad_exif.jpg')._getexif()
         except struct.error:
-            self.fail("Bad EXIF data should not pass incorrect values to _binary unpack")
+            self.fail(
+                 "Bad EXIF data passed incorrect values to _binary unpack")
 
     def test_little_endian(self):
         im = Image.open('Tests/images/16bit.cropped.tif')

Tests/test_file_webp_alpha.py

@@ -83,7 +83,8 @@ class TestFileWebpAlpha(PillowTestCase):
         image.load()
         image.getdata()
 
-        # early versions of webp are known to produce higher deviations: deal with it
+        # early versions of webp are known to produce higher deviations:
+        # deal with it
         if _webp.WebPDecoderVersion(self) <= 0x201:
             self.assert_image_similar(image, pil_image, 3.0)
         else:

Tests/test_file_xpm.py

@@ -19,7 +19,10 @@ class TestFileXpm(PillowTestCase):
         self.assert_image_similar(im.convert('RGB'), hopper('RGB'), 60)
 
     def test_invalid_file(self):
-        self.assertRaises(SyntaxError, lambda: XpmImagePlugin.XpmImageFile("Tests/images/flower.jpg"))
+        invalid_file = "Tests/images/flower.jpg"
+
+        self.assertRaises(SyntaxError,
+                          lambda: XpmImagePlugin.XpmImageFile(invalid_file))
 
     def test_load_read(self):
         # Arrange

Tests/test_imagecolor.py

@@ -18,7 +18,8 @@ class TestImageColor(PillowTestCase):
             (255, 0, 0, 0), ImageColor.getrgb("rgba(255, 0, 0, 0)"))
         self.assertEqual((255, 0, 0), ImageColor.getrgb("red"))
 
-        self.assertRaises(ValueError, lambda: ImageColor.getrgb("invalid color"))
+        self.assertRaises(ValueError,
+                          lambda: ImageColor.getrgb("invalid color"))
 
     # look for rounding errors (based on code by Tim Hatch)
     def test_rounding_errors(self):
@@ -45,8 +46,8 @@ class TestImageColor(PillowTestCase):
 
         self.assertEqual(0, ImageColor.getcolor("black", "L"))
         self.assertEqual(255, ImageColor.getcolor("white", "L"))
-        self.assertEqual(
+        self.assertEqual(162,
-            162, ImageColor.getcolor("rgba(0, 255, 115, 33)", "L"))
+                         ImageColor.getcolor("rgba(0, 255, 115, 33)", "L"))
         Image.new("L", (1, 1), "white")
 
         self.assertEqual(0, ImageColor.getcolor("black", "1"))

Tests/test_imagedraw.py

@@ -55,7 +55,8 @@ class TestImageDraw(PillowTestCase):
     def test_mode_mismatch(self):
         im = hopper("RGB").copy()
 
-        self.assertRaises(ValueError, lambda: ImageDraw.ImageDraw(im, mode="L"))
+        self.assertRaises(ValueError,
+                          lambda: ImageDraw.ImageDraw(im, mode="L"))
 
     def helper_arc(self, bbox):
         # Arrange

Tests/test_imagefont_bitmap.py

@@ -5,16 +5,19 @@ from PIL import Image, ImageFont, ImageDraw
 class TestImageFontBitmap(PillowTestCase):
     def test_similar(self):
         text = 'EmbeddedBitmap'
-        font_outline = ImageFont.truetype(font='Tests/fonts/DejaVuSans.ttf', size=24)
+        font_outline = ImageFont.truetype(
-        font_bitmap = ImageFont.truetype(font='Tests/fonts/DejaVuSans-bitmap.ttf', size=24)
+                       font='Tests/fonts/DejaVuSans.ttf', size=24)
+        font_bitmap = ImageFont.truetype(
+                      font='Tests/fonts/DejaVuSans-bitmap.ttf', size=24)
         size_outline, size_bitmap = font_outline.getsize(text), font_bitmap.getsize(text)
         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_outline = im_bitmap.copy()
         draw_bitmap, draw_outline = ImageDraw.Draw(im_bitmap), ImageDraw.Draw(im_outline)
 
-        # Metrics are different on the bitmap and ttf fonts, more so on some platforms
+        # Metrics are different on the bitmap and ttf fonts,
-        # and versions of freetype than others. Mac has a 1px difference, linux doesn't.
+        # more so on some platforms and versions of freetype than others.
+        # Mac has a 1px difference, linux doesn't.
         draw_bitmap.text((0, size_final[1] - size_bitmap[1]),
                          text, fill=(0, 0, 0), font=font_bitmap)
         draw_outline.text((0, size_final[1] - size_outline[1]),

Tests/test_imageops_usm.py

@@ -75,7 +75,9 @@ class TestImageOpsUsm(PillowTestCase):
                         (4, 3, 2), (4, 2, 2)]:
             self.assertGreaterEqual(i.im.getpixel((x, y))[c], 250)
         # Fuzzy match.
-        gp = lambda x, y: i.im.getpixel((x, y))
+
+        def gp(x, y):
+            return i.im.getpixel((x, y))
         self.assertTrue(236 <= gp(7, 4)[0] <= 239)
         self.assertTrue(236 <= gp(7, 5)[2] <= 239)
         self.assertTrue(236 <= gp(7, 6)[2] <= 239)

Tests/test_imagewin.py

@@ -115,7 +115,8 @@ class TestImageWinDib(PillowTestCase):
 
         # Act/Assert
         self.assert_warning(DeprecationWarning, dib.tostring)
-        self.assert_warning(DeprecationWarning, lambda: dib.fromstring(test_buffer))
+        self.assert_warning(DeprecationWarning,
+                            lambda: dib.fromstring(test_buffer))
 
 
 if __name__ == '__main__':