Merge pull request #2437 from radarhere/health

Health fixes

PIL/EpsImagePlugin.py

@@ -25,7 +25,7 @@
 import os
 import sys
 from . import Image, ImageFile
-from ._binary import i32le as i32, o32le as o32
+from ._binary import i32le as i32
 
 __version__ = "0.5"
 
@@ -84,7 +84,6 @@ def Ghostscript(tile, size, fp, scale=1):
            float((72.0 * size[1]) / (bbox[3]-bbox[1])))
     # print("Ghostscript", scale, size, orig_size, bbox, orig_bbox, res)
 
-    import os
     import subprocess
     import tempfile
 

PIL/GifImagePlugin.py

@@ -508,7 +508,6 @@ def _save_netpbm(im, fp, filename):
 
     import os
     from subprocess import Popen, check_call, PIPE, CalledProcessError
-    import tempfile
     file = im._dump()
 
     with open(filename, 'wb') as f:

PIL/JpegImagePlugin.py

@@ -39,7 +39,7 @@
 import io
 import warnings
 from . import Image, ImageFile, TiffImagePlugin
-from ._binary import i8, o8, i16be as i16, i32be as i32
+from ._binary import i8, o8, i16be as i16
 from .JpegPresets import presets
 from ._util import isStringType
 

PIL/PngImagePlugin.py

@@ -37,7 +37,7 @@
 import struct
 
 from . import Image, ImageFile, ImagePalette
-from ._binary import i8, i16be as i16, i32be as i32, o8, o16be as o16, o32be as o32
+from ._binary import i8, i16be as i16, i32be as i32, o16be as o16, o32be as o32
 
 __version__ = "0.9"
 

PIL/SunImagePlugin.py

@@ -37,7 +37,8 @@ class SunImageFile(ImageFile.ImageFile):
 
     def _open(self):
 
-        # The Sun Raster file header is 32 bytes in length and has the following format:
+        # The Sun Raster file header is 32 bytes in length
+        # and has the following format:
 
         #     typedef struct _SunRaster
         #     {

PIL/TgaImagePlugin.py

@@ -18,7 +18,7 @@
 
 
 from . import Image, ImageFile, ImagePalette
-from ._binary import i8, i16le as i16, o8, o16le as o16, o32le as o32
+from ._binary import i8, i16le as i16, o8, o16le as o16
 
 __version__ = "0.3"
 

PIL/TiffImagePlugin.py

@@ -1168,7 +1168,7 @@ def _setup(self):
                 self.info["dpi"] = xres, yres
             elif resunit == 3:  # dots per centimeter. convert to dpi
                 self.info["dpi"] = xres * 2.54, yres * 2.54
-            elif resunit == None: # used to default to 1, but now 2)
+            elif resunit is None: # used to default to 1, but now 2)
                 self.info["dpi"] = xres, yres
                 # For backward compatibility, we also preserve the old behavior.
                 self.info["resolution"] = xres, yres

Tests/helper.py

@@ -167,7 +167,6 @@ def open_withImagemagick(self, f):
 
         outfile = self.tempfile("temp.png")
         if command_succeeds([IMCONVERT, f, outfile]):
-            from PIL import Image
             return Image.open(outfile)
         raise IOError()
 
@@ -179,7 +178,6 @@ def open_withImagemagick(self, f):
 
 def fromstring(data):
     from io import BytesIO
-    from PIL import Image
     return Image.open(BytesIO(data))
 
 
@@ -191,7 +189,6 @@ def tostring(im, string_format, **options):
 
 
 def hopper(mode=None, cache={}):
-    from PIL import Image
     if mode is None:
         # Always return fresh not-yet-loaded version of image.
         # Operations on not-yet-loaded images is separate class of errors

Tests/test_file_fitsstub.py

@@ -32,7 +32,7 @@ def test_load(self):
         im = Image.open(TEST_FILE)
 
         # Act / Assert: stub cannot load without an implemented handler
-        self.assertRaises(IOError, lambda: im.load())
+        self.assertRaises(IOError, im.load)
 
     def test_save(self):
         # Arrange

Tests/test_file_gif.py

@@ -90,8 +90,6 @@ def check(colors, size, expected_palette_length):
         check(256, 511, 256)
 
     def test_optimize_full_l(self):
-        from io import BytesIO
-
         im = Image.frombytes("L", (16, 16), bytes(bytearray(range(256))))
         test_file = BytesIO()
         im.save(test_file, "GIF", optimize=True)
@@ -425,7 +423,7 @@ def test_transparent_optimize(self):
         reloaded = Image.open(out)
 
         self.assertEqual(reloaded.info['transparency'], 253)
-        
+
 
 if __name__ == '__main__':
     unittest.main()

Tests/test_file_hdf5stub.py

@@ -32,7 +32,7 @@ def test_load(self):
         im = Image.open(TEST_FILE)
 
         # Act / Assert: stub cannot load without an implemented handler
-        self.assertRaises(IOError, lambda: im.load())
+        self.assertRaises(IOError, im.load)
 
     def test_save(self):
         # Arrange

Tests/test_file_jpeg.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, hopper, py3
+from helper import unittest, PillowTestCase, hopper
 from helper import djpeg_available, cjpeg_available
 
 from io import BytesIO
@@ -32,11 +32,11 @@ def gen_random_image(self, size, mode='RGB'):
         """ Generates a very hard to compress file
         :param size: tuple
         :param mode: optional image mode
-        
+
         """
         return Image.frombytes(mode, size,
                                os.urandom(size[0]*size[1]*len(mode)))
-    
+
     def test_sanity(self):
 
         # internal version number
@@ -176,7 +176,7 @@ def test_progressive_cmyk_buffer(self):
         f = BytesIO()
         im = self.gen_random_image((256,256), 'CMYK')
         im.save(f, format='JPEG', progressive=True, quality=94)
-        
+
     def test_large_exif(self):
         # https://github.com/python-pillow/Pillow/issues/148
         f = self.tempfile('temp.jpg')

Tests/test_file_libtiff.py

@@ -564,20 +564,6 @@ def test_save_tiff_with_jpegtables(self):
         # Should not raise UnicodeDecodeError or anything else
         im.save(outfile)
 
-    def test_page_number_x_0(self):
-        # Issue 973
-        # Test TIFF with tag 297 (Page Number) having value of 0 0.
-        # The first number is the current page number.
-        # The second is the total number of pages, zero means not available.
-        outfile = self.tempfile("temp.tif")
-        # Created by printing a page in Chrome to PDF, then:
-        # /usr/bin/gs -q -sDEVICE=tiffg3 -sOutputFile=total-pages-zero.tif
-        # -dNOPAUSE /tmp/test.pdf -c quit
-        infile = "Tests/images/total-pages-zero.tif"
-        im = Image.open(infile)
-        # Should not divide by zero
-        im.save(outfile)
-
 
 if __name__ == '__main__':
     unittest.main()

Tests/test_file_wmf.py

@@ -1,6 +1,5 @@
 from helper import unittest, PillowTestCase
 from PIL import Image
-from io import BytesIO
 
 class TestFileWmf(PillowTestCase):
 

Tests/test_imagecms.py

@@ -343,7 +343,7 @@ def create_test_image():
             ]
             chans = []
             bands = ImageMode.getmode(mode).bands
-            for band_ndx, band in enumerate(bands):
+            for band_ndx in range(len(bands)):
                 channel_type = 'L' # 8-bit unorm
                 channel_pattern = hopper(channel_type)
 

Tests/test_imagesequence.py

@@ -58,7 +58,6 @@ def test_consecutive(self):
         for frame in ImageSequence.Iterator(im):
             if firstFrame is None:
                 firstFrame = frame.copy()
-            pass
         for frame in ImageSequence.Iterator(im):
             self.assert_image_equal(frame, firstFrame)
             break