Merge 1c5d205 into 76d156b

PIL/BdfFontFile.py

@@ -90,7 +90,7 @@ class BdfFontFile(FontFile.FontFile):
 
     def __init__(self, fp):
 
-        FontFile.FontFile.__init__(self)
+        super(BdfFontFile, self).__init__()
 
         s = fp.readline()
         if s[:13] != b"STARTFONT 2.1":

PIL/ImageFile.py

@@ -76,7 +76,7 @@ class ImageFile(Image.Image):
     "Base class for image file format handlers."
 
     def __init__(self, fp=None, filename=None):
-        Image.Image.__init__(self)
+        super(ImageFile, self).__init__()
 
         self.tile = None
         self.readonly = 1  # until we know better

PIL/ImageQt.py

@@ -179,9 +179,9 @@ def __init__(self, im):
             # buffer, so this buffer has to hang on for the life of the image.
             # Fixes https://github.com/python-pillow/Pillow/issues/1370
             self.__data = im_data['data']
-            QImage.__init__(self,
-                            self.__data, im_data['im'].size[0],
-                            im_data['im'].size[1], im_data['format'])
+            super(QImage, self).__init__(
+                self.__data, im_data['im'].size[0],
+                im_data['im'].size[1], im_data['format'])
             if im_data['colortable']:
                 self.setColorTable(im_data['colortable'])
 

PIL/ImageTk.py

@@ -277,8 +277,7 @@ def __init__(self, master, im):
                 self.image = BitmapImage(im, foreground="white", master=master)
             else:
                 self.image = PhotoImage(im, master=master)
-            tkinter.Label.__init__(self, master, image=self.image,
-                                   bg="black", bd=0)
+            super(UI, self).__init__(master, image=self.image, bg="black", bd=0)
 
     if not tkinter._default_root:
         raise IOError("tkinter not initialized")

PIL/ImageWin.py

@@ -229,7 +229,7 @@ def __init__(self, image, title="PIL"):
             image = Dib(image)
         self.image = image
         width, height = image.size
-        Window.__init__(self, title, width=width, height=height)
+        super(ImageWindow, self).__init__(title, width=width, height=height)
 
     def ui_handle_repair(self, dc, x0, y0, x1, y1):
         self.image.draw(dc, (x0, y0, x1, y1))

PIL/PcfFontFile.py

@@ -66,7 +66,7 @@ def __init__(self, fp):
         if magic != PCF_MAGIC:
             raise SyntaxError("not a PCF file")
 
-        FontFile.FontFile.__init__(self)
+        super(PcfFontFile, self).__init__()
 
         count = l32(fp.read(4))
         self.toc = {}

PIL/PngImagePlugin.py

@@ -281,7 +281,7 @@ class PngStream(ChunkStream):
 
     def __init__(self, fp):
 
-        ChunkStream.__init__(self, fp)
+        super(PngStream, self).__init__(fp)
 
         # local copies of Image attributes
         self.im_info = {}

PIL/TarIO.py

@@ -53,4 +53,4 @@ def __init__(self, tarfile, file):
             fh.seek((size + 511) & (~511), 1)
 
         # Open region
-        ContainerIO.ContainerIO.__init__(self, fh, fh.tell(), size)
+        super(TarIO, self).__init__(fh, fh.tell(), size)

PIL/TiffImagePlugin.py

@@ -815,7 +815,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2):
     ..  deprecated:: 3.0.0
     """
     def __init__(self, *args, **kwargs):
-        ImageFileDirectory_v2.__init__(self, *args, **kwargs)
+        super(ImageFileDirectory_v1, self).__init__(*args, **kwargs)
         self._legacy_api = True
 
     tags = property(lambda self: self._tags_v1)

Scripts/enhancer.py

@@ -21,7 +21,7 @@
 
 class Enhance(Frame):
     def __init__(self, master, image, name, enhancer, lo, hi):
-        Frame.__init__(self, master)
+        super(Enhance, self).__init__(master)
 
         # set up the image
         self.tkim = ImageTk.PhotoImage(image.mode, image.size)

Scripts/painter.py

@@ -23,7 +23,7 @@
 
 class PaintCanvas(Canvas):
     def __init__(self, master, image):
-        Canvas.__init__(self, master, width=image.size[0], height=image.size[1])
+        super(PaintCanvas, self).__init__(master, width=image.size[0], height=image.size[1])
 
         # fill the canvas
         self.tile = {}

Scripts/player.py

@@ -34,7 +34,7 @@ def __init__(self, master, im):
         else:
             self.image = ImageTk.PhotoImage(im)
 
-        Label.__init__(self, master, image=self.image, bg="black", bd=0)
+        super(UI, self).__init__(master, image=self.image, bg="black", bd=0)
 
         self.update()
 

Scripts/thresholder.py

@@ -21,7 +21,7 @@
 
 class UI(Frame):
     def __init__(self, master, im, value=128):
-        Frame.__init__(self, master)
+        super(UI, self).__init__(master)
 
         self.image = im
         self.value = value

Scripts/viewer.py

@@ -24,12 +24,12 @@ def __init__(self, master, im):
         if im.mode == "1":
             # bitmap image
             self.image = ImageTk.BitmapImage(im, foreground="white")
-            Label.__init__(self, master, image=self.image, bg="black", bd=0)
+            super(UI, self).__init__(master, image=self.image, bg="black", bd=0)
 
         else:
             # photo image
             self.image = ImageTk.PhotoImage(im)
-            Label.__init__(self, master, image=self.image, bd=0)
+            super(UI, self).__init__(master, image=self.image, bd=0)
 
 #
 # script interface

Tests/helper.py

@@ -15,7 +15,7 @@
 class PillowTestCase(unittest.TestCase):
 
     def __init__(self, *args, **kwargs):
-        unittest.TestCase.__init__(self, *args, **kwargs)
+        super(PillowTestCase, self).__init__(*args, **kwargs)
         # holds last result object passed to run method:
         self.currentResult = None