diff --git a/Tests/check_j2k_overflow.py b/Tests/check_j2k_overflow.py index de671a53f..474b49948 100644 --- a/Tests/check_j2k_overflow.py +++ b/Tests/check_j2k_overflow.py @@ -1,6 +1,7 @@ from PIL import Image from helper import unittest, PillowTestCase + class TestJ2kEncodeOverflow(PillowTestCase): def test_j2k_overflow(self): @@ -12,7 +13,7 @@ class TestJ2kEncodeOverflow(PillowTestCase): except IOError as err: self.assertTrue(True, "IOError is expected") except Exception as err: - self.assertTrue(False, "Expected IOError, got %s" %type(err)) + self.assertTrue(False, "Expected IOError, got %s" % type(err)) if __name__ == '__main__': unittest.main() diff --git a/Tests/test_file_bmp.py b/Tests/test_file_bmp.py index 5d6b30e79..36bc84d84 100644 --- a/Tests/test_file_bmp.py +++ b/Tests/test_file_bmp.py @@ -77,6 +77,5 @@ class TestFileBmp(PillowTestCase): self.assert_image_equal(im, target) - if __name__ == '__main__': unittest.main() diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py index ef86a1136..378bd6377 100644 --- a/Tests/test_file_libtiff.py +++ b/Tests/test_file_libtiff.py @@ -170,7 +170,8 @@ class TestFileLibTiff(LibTiffTestCase): 'RowsPerStrip', 'StripOffsets'] 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_additional_metadata(self): # these should not crash. Seriously dummy data, most of it doesn't make @@ -183,7 +184,8 @@ class TestFileLibTiff(LibTiffTestCase): in TiffTags.LIBTIFF_CORE] if info.type is not None) - # Exclude ones that have special meaning that we're already testing them + # Exclude ones that have special meaning + # that we're already testing them im = Image.open('Tests/images/hopper_g4.tif') for tag in im.tag_v2.keys(): try: @@ -422,8 +424,8 @@ class TestFileLibTiff(LibTiffTestCase): def test_gray_semibyte_per_pixel(self): test_files = ( ( - 24.8,#epsilon - (#group + 24.8, # epsilon + ( # group "Tests/images/tiff_gray_2_4_bpp/hopper2.tif", "Tests/images/tiff_gray_2_4_bpp/hopper2I.tif", "Tests/images/tiff_gray_2_4_bpp/hopper2R.tif", @@ -431,8 +433,8 @@ class TestFileLibTiff(LibTiffTestCase): ) ), ( - 7.3,#epsilon - (#group + 7.3, # epsilon + ( # group "Tests/images/tiff_gray_2_4_bpp/hopper4.tif", "Tests/images/tiff_gray_2_4_bpp/hopper4I.tif", "Tests/images/tiff_gray_2_4_bpp/hopper4R.tif", @@ -504,6 +506,5 @@ class TestFileLibTiff(LibTiffTestCase): im.save(outfile) - if __name__ == '__main__': unittest.main() diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py index 4bdfb603b..418aaf41e 100644 --- a/Tests/test_file_png.py +++ b/Tests/test_file_png.py @@ -313,7 +313,7 @@ class TestFilePng(PillowTestCase): # -14: malformed chunk for offset in (-10, -13, -14): - with open(TEST_PNG_FILE,'rb') as f: + with open(TEST_PNG_FILE, 'rb') as f: test_file = f.read()[:offset] im = Image.open(BytesIO(test_file)) @@ -347,7 +347,6 @@ class TestFilePng(PillowTestCase): finally: ImageFile.LOAD_TRUNCATED_IMAGES = False - def test_roundtrip_dpi(self): # Check dpi roundtripping diff --git a/Tests/test_image_access.py b/Tests/test_image_access.py index 40f648f27..be7457bb7 100644 --- a/Tests/test_image_access.py +++ b/Tests/test_image_access.py @@ -105,6 +105,7 @@ class TestCffiPutPixel(TestImagePutPixel): def setUp(self): try: import cffi + assert cffi # silence warning except ImportError: self.skipTest("No cffi") @@ -115,6 +116,7 @@ class TestCffiGetPixel(TestImageGetPixel): def setUp(self): try: import cffi + assert cffi # silence warning except ImportError: self.skipTest("No cffi") @@ -125,6 +127,7 @@ class TestCffi(AccessTest): def setUp(self): try: import cffi + assert cffi # silence warning except ImportError: self.skipTest("No cffi") diff --git a/Tests/test_imagepath.py b/Tests/test_imagepath.py index 1df9715e0..d5ec5dfaa 100644 --- a/Tests/test_imagepath.py +++ b/Tests/test_imagepath.py @@ -5,6 +5,7 @@ from PIL import ImagePath, Image import array import struct + class TestImagePath(PillowTestCase): def test_path(self): @@ -61,7 +62,6 @@ class TestImagePath(PillowTestCase): p = ImagePath.Path(arr.tostring()) self.assertEqual(list(p), [(0.0, 1.0)]) - def test_overflow_segfault(self): try: # post patch, this fails with a memory error diff --git a/Tests/test_imagesequence.py b/Tests/test_imagesequence.py index f79c5fe87..8c65e6358 100644 --- a/Tests/test_imagesequence.py +++ b/Tests/test_imagesequence.py @@ -56,7 +56,7 @@ class TestImageSequence(PillowTestCase): im = Image.open('Tests/images/multipage.tiff') firstFrame = None for frame in ImageSequence.Iterator(im): - if firstFrame == None: + if firstFrame is None: firstFrame = frame.copy() pass for frame in ImageSequence.Iterator(im): diff --git a/Tests/test_imagetk.py b/Tests/test_imagetk.py index d29953453..f56333a59 100644 --- a/Tests/test_imagetk.py +++ b/Tests/test_imagetk.py @@ -8,6 +8,7 @@ except (OSError, ImportError) as v: # Skipped via setUp() pass + class TestImageTk(PillowTestCase): def setUp(self): @@ -24,7 +25,7 @@ class TestImageTk(PillowTestCase): im2 = Image.open(TEST_PNG) with open(TEST_PNG, 'rb') as fp: data = fp.read() - kw = {"file":TEST_JPG, "data":data} + kw = {"file": TEST_JPG, "data": data} # Test "file" im = ImageTk._get_image_from_kw(kw) diff --git a/Tests/test_imagewin_pointers.py b/Tests/test_imagewin_pointers.py index 692868bdf..f37c67eac 100644 --- a/Tests/test_imagewin_pointers.py +++ b/Tests/test_imagewin_pointers.py @@ -57,7 +57,10 @@ if sys.platform.startswith('win32'): DeleteObject.argtypes = [ctypes.wintypes.HGDIOBJ] CreateDIBSection = ctypes.windll.gdi32.CreateDIBSection - CreateDIBSection.argtypes = [ctypes.wintypes.HDC, ctypes.c_void_p, ctypes.c_uint, ctypes.POINTER(ctypes.c_void_p), ctypes.wintypes.HANDLE, ctypes.wintypes.DWORD] + CreateDIBSection.argtypes = [ctypes.wintypes.HDC, ctypes.c_void_p, + ctypes.c_uint, + ctypes.POINTER(ctypes.c_void_p), + ctypes.wintypes.HANDLE, ctypes.wintypes.DWORD] CreateDIBSection.restype = ctypes.wintypes.HBITMAP def serialize_dib(bi, pixels): @@ -99,7 +102,8 @@ if sys.platform.startswith('win32'): hdc = CreateCompatibleDC(None) # print('hdc:',hex(hdc)) pixels = ctypes.c_void_p() - dib = CreateDIBSection(hdc, ctypes.byref(hdr), DIB_RGB_COLORS, ctypes.byref(pixels), None, 0) + dib = CreateDIBSection(hdc, ctypes.byref(hdr), DIB_RGB_COLORS, + ctypes.byref(pixels), None, 0) SelectObject(hdc, dib) imdib.expose(hdc) diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py index 804ff832f..40b7c64e3 100644 --- a/Tests/test_numpy.py +++ b/Tests/test_numpy.py @@ -6,6 +6,8 @@ from PIL import Image try: import site import numpy + assert site # silence warning + assert numpy # silence warning except ImportError: # Skip via setUp() pass @@ -18,6 +20,8 @@ class TestNumpy(PillowTestCase): try: import site import numpy + assert site # silence warning + assert numpy # silence warning except ImportError: self.skipTest("ImportError") diff --git a/Tests/test_tiff_ifdrational.py b/Tests/test_tiff_ifdrational.py index 3a38f2237..dd3ad1b3d 100644 --- a/Tests/test_tiff_ifdrational.py +++ b/Tests/test_tiff_ifdrational.py @@ -48,7 +48,7 @@ class Test_IFDRational(PillowTestCase): methods = (True, False) if 'libtiff_encoder' not in dir(Image.core): methods = (False) - + for libtiff in methods: TiffImagePlugin.WRITE_LIBTIFF = libtiff