Merge remote-tracking branch 'upstream/master' into _util

CHANGES.rst

@@ -4,9 +4,18 @@ Changelog (Pillow)
 2.6.0 (unreleased)
 ------------------
 
-- Test PalmImagePlugin and method to skip known bad tests
-  [hugovk, wiredfool]
+- Fix dispose calculations for animated GIFs #765
+  [larsjsol]
 
+- 32bit mult overflow fix #782
+  [wiredfool]
+
+- Added class checking to Image __eq__ function #775
+  [radarhere, hugovk]
+
+- Test PalmImagePlugin and method to skip known bad tests #776
+  [hugovk, wiredfool]
+  
 
 2.5.0 (2014-07-01)
 ------------------

PIL/FontFile.py

@@ -17,8 +17,6 @@
 import os
 from PIL import Image, _binary
 
-import marshal
-
 try:
     import zlib
 except ImportError:
@@ -26,6 +24,7 @@ except ImportError:
 
 WIDTH = 800
 
+
 def puti16(fp, values):
     # write network order (big-endian) 16-bit sequence
     for v in values:
@@ -33,6 +32,7 @@ def puti16(fp, values):
             v += 65536
         fp.write(_binary.o16be(v))
 
+
 ##
 # Base class for raster font file handlers.
 
@@ -95,9 +95,8 @@ class FontFile:
                 # print chr(i), dst, s
                 self.metrics[i] = d, dst, s
 
-
-    def save1(self, filename):
-        "Save font in version 1 format"
+    def save(self, filename):
+        "Save font"
 
         self.compile()
 
@@ -107,7 +106,7 @@ class FontFile:
         # font metrics
         fp = open(os.path.splitext(filename)[0] + ".pil", "wb")
         fp.write(b"PILfont\n")
-        fp.write((";;;;;;%d;\n" % self.ysize).encode('ascii')) # HACK!!!
+        fp.write((";;;;;;%d;\n" % self.ysize).encode('ascii'))  # HACK!!!
         fp.write(b"DATA\n")
         for id in range(256):
             m = self.metrics[id]
@@ -117,30 +116,4 @@ class FontFile:
                 puti16(fp, m[0] + m[1] + m[2])
         fp.close()
 
-
-    def save2(self, filename):
-        "Save font in version 2 format"
-
-        # THIS IS WORK IN PROGRESS
-
-        self.compile()
-
-        data = marshal.dumps((self.metrics, self.info))
-
-        if zlib:
-            data = b"z" + zlib.compress(data, 9)
-        else:
-            data = b"u" + data
-
-        fp = open(os.path.splitext(filename)[0] + ".pil", "wb")
-
-        fp.write(b"PILfont2\n" + self.name + "\n" + "DATA\n")
-
-        fp.write(data)
-
-        self.bitmap.save(fp, "PNG")
-
-        fp.close()
-
-
-    save = save1 # for now
+# End of file

PIL/GifImagePlugin.py

@@ -96,8 +96,15 @@ class GifImageFile(ImageFile.ImageFile):
             # rewind
             self.__offset = 0
             self.dispose = None
+            self.dispose_extent = [0, 0, 0, 0] #x0, y0, x1, y1
             self.__frame = -1
             self.__fp.seek(self.__rewind)
+            self._prev_im = None
+            self.disposal_method = 0
+        else:
+            # ensure that the previous frame was loaded
+            if not self.im:
+                self.load()
 
         if frame != self.__frame + 1:
             raise ValueError("cannot seek to frame %d" % frame)
@@ -114,8 +121,7 @@ class GifImageFile(ImageFile.ImageFile):
             self.__offset = 0
 
         if self.dispose:
-            self.im = self.dispose
-            self.dispose = None
+            self.im.paste(self.dispose, self.dispose_extent)
 
         from copy import copy
         self.palette = copy(self.global_palette)
@@ -140,17 +146,16 @@ class GifImageFile(ImageFile.ImageFile):
                     if flags & 1:
                         self.info["transparency"] = i8(block[3])
                     self.info["duration"] = i16(block[1:3]) * 10
-                    try:
-                        # disposal methods
-                        if flags & 8:
-                            # replace with background colour
-                            self.dispose = Image.core.fill("P", self.size,
-                                self.info["background"])
-                        elif flags & 16:
-                            # replace with previous contents
-                            self.dispose = self.im.copy()
-                    except (AttributeError, KeyError):
-                        pass
+
+                    # disposal method - find the value of bits 4 - 6
+                    dispose_bits = 0b00011100 & flags
+                    dispose_bits = dispose_bits >> 2
+                    if dispose_bits:
+                        # only set the dispose if it is not
+                        # unspecified. I'm not sure if this is
+                        # correct, but it seems to prevent the last
+                        # frame from looking odd for some animations
+                        self.disposal_method = dispose_bits
                 elif i8(s) == 255:
                     #
                     # application extension
@@ -172,6 +177,7 @@ class GifImageFile(ImageFile.ImageFile):
                 # extent
                 x0, y0 = i16(s[0:]), i16(s[2:])
                 x1, y1 = x0 + i16(s[4:]), y0 + i16(s[6:])
+                self.dispose_extent = x0, y0, x1, y1
                 flags = i8(s[8])
 
                 interlace = (flags & 64) != 0
@@ -194,6 +200,26 @@ class GifImageFile(ImageFile.ImageFile):
                 pass
                 # raise IOError, "illegal GIF tag `%x`" % i8(s)
 
+        try:
+            if self.disposal_method < 2:
+                # do not dispose or none specified
+                self.dispose = None
+            elif self.disposal_method == 2:
+                # replace with background colour
+                self.dispose = Image.core.fill("P", self.size,
+                                               self.info["background"])
+            else:
+                # replace with previous contents
+                if self.im:
+                    self.dispose = self.im.copy()
+
+            # only dispose the extent in this frame
+            if self.dispose:
+                self.dispose = self.dispose.crop(self.dispose_extent)
+        except (AttributeError, KeyError):
+            pass
+
+
         if not self.tile:
             # self.__fp = None
             raise EOFError("no more images in GIF file")
@@ -205,6 +231,18 @@ class GifImageFile(ImageFile.ImageFile):
     def tell(self):
         return self.__frame
 
+    def load_end(self):
+        ImageFile.ImageFile.load_end(self)
+
+        # if the disposal method is 'do not dispose', transparent
+        # pixels should show the content of the previous frame
+        if self._prev_im and self.disposal_method == 1:
+            # we do this by pasting the updated area onto the previous
+            # frame which we then use as the current image content
+            updated = self.im.crop(self.dispose_extent)
+            self._prev_im.paste(updated, self.dispose_extent, updated.convert('RGBA'))
+            self.im = self._prev_im
+        self._prev_im = self.im.copy()
 
 # --------------------------------------------------------------------
 # Write GIF files

PIL/Image.py

@@ -573,6 +573,8 @@ class Image:
         return file
 
     def __eq__(self, other):
+        if self.__class__.__name__ != other.__class__.__name__:
+            return False
         a = (self.mode == other.mode)
         b = (self.size == other.size)
         c = (self.getpalette() == other.getpalette())

Tests/32bit_segfault_check.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from PIL import Image
+import sys
+
+
+if sys.maxsize < 2**32:
+    im = Image.new('L', (999999, 999999), 0)
+		
+

Tests/helper.py

@@ -5,22 +5,19 @@ from __future__ import print_function
 import sys
 import tempfile
 import os
-import glob
 
 if sys.version_info[:2] <= (2, 6):
     import unittest2 as unittest
 else:
     import unittest
 
-def tearDownModule():
-    #remove me later
-    pass
 
 class PillowTestCase(unittest.TestCase):
 
     def __init__(self, *args, **kwargs):
         unittest.TestCase.__init__(self, *args, **kwargs)
-        self.currentResult = None  # holds last result object passed to run method
+        # holds last result object passed to run method:
+        self.currentResult = None
 
     def run(self, result=None):
         self.currentResult = result  # remember result for use later
@@ -40,7 +37,7 @@ class PillowTestCase(unittest.TestCase):
             except OSError:
                 pass  # report?
         else:
-            print("=== orphaned temp file: %s" %path)
+            print("=== orphaned temp file: %s" % path)
 
     def assert_almost_equal(self, a, b, msg=None, eps=1e-6):
         self.assertLess(
@@ -134,7 +131,7 @@ class PillowTestCase(unittest.TestCase):
         if platform is not None:
             skip = sys.platform.startswith(platform)
         if travis is not None:
-            skip = skip and (travis == bool(os.environ.get('TRAVIS',False)))
+            skip = skip and (travis == bool(os.environ.get('TRAVIS', False)))
         if skip:
             self.skipTest(msg or "Known Bad Test")
 
@@ -142,8 +139,8 @@ class PillowTestCase(unittest.TestCase):
         assert template[:5] in ("temp.", "temp_")
         (fd, path) = tempfile.mkstemp(template[4:], template[:4])
         os.close(fd)
-        
-        self.addCleanup(self.delete_tempfile, path)      
+
+        self.addCleanup(self.delete_tempfile, path)
         return path
 
     def open_withImagemagick(self, f):
@@ -155,8 +152,8 @@ class PillowTestCase(unittest.TestCase):
             from PIL import Image
             return Image.open(outfile)
         raise IOError()
-    
-        
+
+
 # helpers
 
 import sys
@@ -210,17 +207,21 @@ def command_succeeds(cmd):
             return False
     return True
 
+
 def djpeg_available():
     return command_succeeds(['djpeg', '--help'])
 
+
 def cjpeg_available():
     return command_succeeds(['cjpeg', '--help'])
 
+
 def netpbm_available():
-    return command_succeeds(["ppmquant", "--help"]) and \
-           command_succeeds(["ppmtogif", "--help"])
+    return (command_succeeds(["ppmquant", "--help"]) and
+            command_succeeds(["ppmtogif", "--help"]))
+
 
 def imagemagick_available():
     return command_succeeds(['convert', '-version'])
-                            
+
 # End of file

Tests/test_000_sanity.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 import PIL
 import PIL.Image

Tests/test_bmp_reference.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 import os

Tests/test_cffi.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 try:
     import cffi

Tests/test_decompression_bomb.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_file_bmp.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 import io

Tests/test_file_eps.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image, EpsImagePlugin
 import io

Tests/test_file_fli.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_file_gif.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena, netpbm_available
+from helper import unittest, PillowTestCase, lena, netpbm_available
 
 from PIL import Image
 from PIL import GifImagePlugin
@@ -106,6 +106,50 @@ class TestFileGif(PillowTestCase):
         GifImagePlugin._save_netpbm(img, 0, tempfile)
         self.assert_image_similar(img, Image.open(tempfile).convert("L"), 0)
 
+    def test_seek(self):
+        img = Image.open("Tests/images/dispose_none.gif")
+        framecount = 0
+        try:
+            while True:
+                framecount += 1
+                img.seek(img.tell() +1)
+        except EOFError:
+            self.assertEqual(framecount, 5)
+
+    def test_dispose_none(self):
+        img = Image.open("Tests/images/dispose_none.gif")
+        try:
+            while True:
+                img.seek(img.tell() +1)
+                self.assertEqual(img.disposal_method, 1)
+        except EOFError:
+            pass
+
+    def test_dispose_background(self):
+        img = Image.open("Tests/images/dispose_bgnd.gif")
+        try:
+            while True:
+                img.seek(img.tell() +1)
+                self.assertEqual(img.disposal_method, 2)
+        except EOFError:
+            pass
+
+    def test_dispose_previous(self):
+        img = Image.open("Tests/images/dispose_prev.gif")
+        try:
+            while True:
+                img.seek(img.tell() +1)
+                self.assertEqual(img.disposal_method, 3)
+        except EOFError:
+            pass
+
+    def test_iss634(self):
+        img = Image.open("Tests/images/iss634.gif")
+        # seek to the second frame
+        img.seek(img.tell() +1)
+        # all transparent pixels should be replaced with the color from the first frame
+        self.assertEqual(img.histogram()[img.info['transparency']], 0)
+
 
 if __name__ == '__main__':
     unittest.main()

Tests/test_file_icns.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_file_ico.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_file_jpeg.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena, py3
+from helper import unittest, PillowTestCase, lena, py3
 from helper import djpeg_available, cjpeg_available
 
 import random

Tests/test_file_jpeg2k.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 from io import BytesIO

Tests/test_file_libtiff.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena, py3
+from helper import unittest, PillowTestCase, lena, py3
 
 import os
 

Tests/test_file_libtiff_small.py

@@ -1,4 +1,4 @@
-from helper import unittest, tearDownModule
+from helper import unittest
 
 from PIL import Image
 

Tests/test_file_msp.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_file_palm.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena, imagemagick_available
+from helper import unittest, PillowTestCase, lena, imagemagick_available
 
 import os.path
 

Tests/test_file_pcx.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_file_pdf.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 import os.path
 

Tests/test_file_png.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from io import BytesIO
 

Tests/test_file_ppm.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_file_psd.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_file_spider.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 from PIL import SpiderImagePlugin

Tests/test_file_tar.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image, TarIO
 

Tests/test_file_tiff.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena, py3
+from helper import unittest, PillowTestCase, lena, py3
 
 from PIL import Image
 

Tests/test_file_tiff_metadata.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image, TiffImagePlugin, TiffTags
 

Tests/test_file_webp.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_file_webp_alpha.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_file_webp_lossless.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_file_webp_metadata.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_file_xbm.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_file_xpm.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_font_bdf.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import FontFile, BdfFontFile
 

Tests/test_font_pcf.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image, FontFile, PcfFontFile
 from PIL import ImageFont, ImageDraw

Tests/test_format_lab.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_image.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 
@@ -44,6 +44,17 @@ class TestImage(PillowTestCase):
         file = self.tempfile("temp.ppm")
         im._dump(file)
 
+    def test_comparison_with_other_type(self):
+        # Arrange
+        item = Image.new('RGB', (25, 25), '#000')
+        num = 12
+
+        # Act/Assert
+        # Shouldn't cause AttributeError (#774)
+        self.assertFalse(item is None)
+        self.assertFalse(item == None)
+        self.assertFalse(item == num)
+
 
 if __name__ == '__main__':
     unittest.main()

Tests/test_image_array.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_convert.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_copy.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_crop.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_draft.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, fromstring, tostring
+from helper import unittest, PillowTestCase, fromstring, tostring
 
 from PIL import Image
 

Tests/test_image_filter.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 from PIL import ImageFilter

Tests/test_image_frombytes.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_getbands.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_image_getbbox.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_getcolors.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 
 class TestImageGetColors(PillowTestCase):

Tests/test_image_getdata.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 
 class TestImageGetData(PillowTestCase):

Tests/test_image_getextrema.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 
 class TestImageGetExtrema(PillowTestCase):

Tests/test_image_getim.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena, py3
+from helper import unittest, PillowTestCase, lena, py3
 
 
 class TestImageGetIm(PillowTestCase):

Tests/test_image_getpalette.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 
 class TestImageGetPalette(PillowTestCase):

Tests/test_image_getpixel.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_image_getprojection.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_histogram.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 
 class TestImageHistogram(PillowTestCase):

Tests/test_image_load.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_mode.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_offset.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 
 class TestImageOffset(PillowTestCase):

Tests/test_image_point.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 import sys
 

Tests/test_image_putalpha.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 

Tests/test_image_putdata.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 import sys
 

Tests/test_image_putpalette.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import ImagePalette
 

Tests/test_image_putpixel.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_quantize.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_resize.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 
 class TestImageResize(PillowTestCase):

Tests/test_image_rotate.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 
 class TestImageRotate(PillowTestCase):

Tests/test_image_split.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_thumbnail.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 
 class TestImageThumbnail(PillowTestCase):

Tests/test_image_tobitmap.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena, fromstring
+from helper import unittest, PillowTestCase, lena, fromstring
 
 
 class TestImageToBitmap(PillowTestCase):

Tests/test_image_transform.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_image_transpose.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_imagechops.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 from PIL import ImageChops

Tests/test_imagecms.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 

Tests/test_imagecolor.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 from PIL import ImageColor

Tests/test_imagedraw.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 from PIL import ImageColor

Tests/test_imageenhance.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 from PIL import ImageEnhance

Tests/test_imagefile.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena, fromstring, tostring
+from helper import unittest, PillowTestCase, lena, fromstring, tostring
 
 from io import BytesIO
 

Tests/test_imagefileio.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena, tostring
+from helper import unittest, PillowTestCase, lena, tostring
 
 from PIL import Image
 from PIL import ImageFileIO

Tests/test_imagefilter.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import ImageFilter
 

Tests/test_imagefont.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 from PIL import ImageDraw

Tests/test_imagegrab.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 try:
     from PIL import ImageGrab

Tests/test_imagemath.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 from PIL import ImageMath

Tests/test_imagemode.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import ImageMode
 

Tests/test_imageops.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import ImageOps
 

Tests/test_imageops_usm.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 from PIL import ImageOps

Tests/test_imagepalette.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import ImagePalette
 

Tests/test_imagepath.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import ImagePath
 

Tests/test_imageqt.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 try:
     from PIL import ImageQt

Tests/test_imagesequence.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import ImageSequence
 

Tests/test_imageshow.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 from PIL import ImageShow

Tests/test_imagestat.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule, lena
+from helper import unittest, PillowTestCase, lena
 
 from PIL import Image
 from PIL import ImageStat

Tests/test_imagetk.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 
 class TestImageTk(PillowTestCase):

Tests/test_imagetransform.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, tearDownModule
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 from PIL import ImageTransform