Use super()

mdboom · mdboom · commit 0b8d69357f88 · 2016-02-17T09:47:57.000-05:00
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -608,15 +608,16 @@ def __init__(self, ax,
 
         self._extent = extent
 
-        _ImageBase.__init__(self, ax,
-                            cmap=cmap,
-                            norm=norm,
-                            interpolation=interpolation,
-                            origin=origin,
-                            filternorm=filternorm,
-                            filterrad=filterrad,
-                            resample=resample,
-                            **kwargs
+        super(AxesImage, self).__init__(
+            ax,
+            cmap=cmap,
+            norm=norm,
+            interpolation=interpolation,
+            origin=origin,
+            filternorm=filternorm,
+            filterrad=filterrad,
+            resample=resample,
+            **kwargs
         )
 
     def get_window_extent(self, renderer=None):
@@ -705,8 +706,7 @@ def __init__(self, ax, **kwargs):
         options.
         """
         interp = kwargs.pop('interpolation', 'nearest')
-        AxesImage.__init__(self, ax,
-                           **kwargs)
+        super(NonUniformImage, self).__init__(ax, **kwargs)
         self.set_interpolation(interp)
 
     def _check_unsampled_image(self, renderer):
@@ -840,13 +840,7 @@ def __init__(self, ax,
         Additional kwargs are matplotlib.artist properties
 
         """
-        martist.Artist.__init__(self)
-        cm.ScalarMappable.__init__(self, norm, cmap)
-        self.axes = ax
-        self._rgbacache = None
-        # There is little point in caching the image itself because
-        # it needs to be remade if the bbox or viewlim change,
-        # so caching does help with zoom/pan/resize.
+        super(PcolorImage, self).__init__(ax, norm=norm, cmap=cmap)
         self.update(kwargs)
         self.set_data(x, y, A)
 
@@ -937,8 +931,12 @@ def __init__(self, fig,
 
         kwargs are an optional list of Artist keyword args
         """
-        _ImageBase.__init__(
-            self, None, norm=norm, cmap=cmap, origin=origin)
+        super(FigureImage, self).__init__(
+            None,
+            norm=norm,
+            cmap=cmap,
+            origin=origin
+        )
         self.figure = fig
         self.ox = offsetx
         self.oy = offsety
@@ -989,15 +987,17 @@ def __init__(self, bbox,
         kwargs are an optional list of Artist keyword args
 
         """
-        _ImageBase.__init__(self, ax=None,
-                            cmap=cmap,
-                            norm=norm,
-                            interpolation=interpolation,
-                            origin=origin,
-                            filternorm=filternorm,
-                            filterrad=filterrad,
-                            resample=resample,
-                            **kwargs)
+        super(BboxImage, self).__init__(
+            None,
+            cmap=cmap,
+            norm=norm,
+            interpolation=interpolation,
+            origin=origin,
+            filternorm=filternorm,
+            filterrad=filterrad,
+            resample=resample,
+            **kwargs
+        )
 
         self.bbox = bbox
         self.interp_at_native = interp_at_native
