Use super() in backend classes and examples.

Author: QuLogic

examples/user_interfaces/embedding_in_wx2_sgskip.py

@@ -20,8 +20,7 @@
 
 class CanvasFrame(wx.Frame):
     def __init__(self):
-        wx.Frame.__init__(self, None, -1,
-                          'CanvasFrame', size=(550, 350))
+        super().__init__(None, -1, 'CanvasFrame', size=(550, 350))
 
         self.figure = Figure()
         self.axes = self.figure.add_subplot(111)

examples/user_interfaces/embedding_in_wx3_sgskip.py

@@ -37,7 +37,7 @@
 
 class PlotPanel(wx.Panel):
     def __init__(self, parent):
-        wx.Panel.__init__(self, parent, -1)
+        super().__init__(parent, -1)
 
         self.fig = Figure((5, 4), 75)
         self.canvas = FigureCanvas(self, -1, self.fig)

examples/user_interfaces/embedding_in_wx4_sgskip.py

@@ -21,7 +21,7 @@ class MyNavigationToolbar(NavigationToolbar):
     """Extend the default wx toolbar with your own event handlers."""
 
     def __init__(self, canvas):
-        NavigationToolbar.__init__(self, canvas)
+        super().__init__(canvas)
         # We use a stock wx bitmap, but you could also use your own image file.
         bmp = wx.ArtProvider.GetBitmap(wx.ART_CROSS_MARK, wx.ART_TOOLBAR)
         tool = self.AddTool(wx.ID_ANY, 'Click me', bmp,
@@ -41,8 +41,7 @@ def _on_custom(self, event):
 
 class CanvasFrame(wx.Frame):
     def __init__(self):
-        wx.Frame.__init__(self, None, -1,
-                          'CanvasFrame', size=(550, 350))
+        super().__init__(None, -1, 'CanvasFrame', size=(550, 350))
 
         self.figure = Figure(figsize=(5, 4), dpi=100)
         self.axes = self.figure.add_subplot(111)

examples/user_interfaces/embedding_in_wx5_sgskip.py

@@ -17,7 +17,7 @@
 
 class Plot(wx.Panel):
     def __init__(self, parent, id=-1, dpi=None, **kwargs):
-        wx.Panel.__init__(self, parent, id=id, **kwargs)
+        super().__init__(parent, id=id, **kwargs)
         self.figure = mpl.figure.Figure(dpi=dpi, figsize=(2, 2))
         self.canvas = FigureCanvas(self, -1, self.figure)
         self.toolbar = NavigationToolbar(self.canvas)
@@ -31,7 +31,7 @@ def __init__(self, parent, id=-1, dpi=None, **kwargs):
 
 class PlotNotebook(wx.Panel):
     def __init__(self, parent, id=-1):
-        wx.Panel.__init__(self, parent, id=id)
+        super().__init__(parent, id=id)
         self.nb = aui.AuiNotebook(self)
         sizer = wx.BoxSizer()
         sizer.Add(self.nb, 1, wx.EXPAND)

examples/user_interfaces/fourier_demo_wx_sgskip.py

@@ -104,7 +104,7 @@ def setKnob(self, value):
 
 class FourierDemoFrame(wx.Frame):
     def __init__(self, *args, **kwargs):
-        wx.Frame.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
         panel = wx.Panel(self)
 
         # create the GUI elements

examples/user_interfaces/mathtext_wx_sgskip.py

@@ -40,7 +40,7 @@ def mathtext_to_wxbitmap(s):
 
 class CanvasFrame(wx.Frame):
     def __init__(self, parent, title):
-        wx.Frame.__init__(self, parent, -1, title, size=(550, 350))
+        super().__init__(parent, -1, title, size=(550, 350))
 
         self.figure = Figure()
         self.axes = self.figure.add_subplot(111)

examples/user_interfaces/wxcursor_demo_sgskip.py

@@ -16,7 +16,7 @@
 
 class CanvasFrame(wx.Frame):
     def __init__(self, ):
-        wx.Frame.__init__(self, None, -1, 'CanvasFrame', size=(550, 350))
+        super().__init__(None, -1, 'CanvasFrame', size=(550, 350))
 
         self.figure = Figure()
         self.axes = self.figure.add_subplot(111)

lib/matplotlib/backends/_backend_tk.py

@@ -77,7 +77,7 @@ class TimerTk(TimerBase):
 
     def __init__(self, parent, *args, **kwargs):
         self._timer = None
-        TimerBase.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.parent = parent
 
     def _timer_start(self):
@@ -90,7 +90,7 @@ def _timer_stop(self):
         self._timer = None
 
     def _on_timer(self):
-        TimerBase._on_timer(self)
+        super()._on_timer()
         # Tk after() is only a single shot, so we need to add code here to
         # reset the timer if we're not operating in single shot mode.  However,
         # if _timer is None, this means that _timer_stop has been called; so
@@ -263,13 +263,13 @@ def motion_notify_event(self, event):
         x = event.x
         # flipy so y=0 is bottom of canvas
         y = self.figure.bbox.height - event.y
-        FigureCanvasBase.motion_notify_event(self, x, y, guiEvent=event)
+        super().motion_notify_event(x, y, guiEvent=event)
 
     def enter_notify_event(self, event):
         x = event.x
         # flipy so y=0 is bottom of canvas
         y = self.figure.bbox.height - event.y
-        FigureCanvasBase.enter_notify_event(self, guiEvent=event, xy=(x, y))
+        super().enter_notify_event(guiEvent=event, xy=(x, y))
 
     def button_press_event(self, event, dblclick=False):
         x = event.x
@@ -284,8 +284,8 @@ def button_press_event(self, event, dblclick=False):
             elif num == 3:
                 num = 2
 
-        FigureCanvasBase.button_press_event(
-            self, x, y, num, dblclick=dblclick, guiEvent=event)
+        super().button_press_event(x, y, num,
+                                   dblclick=dblclick, guiEvent=event)
 
     def button_dblclick_event(self, event):
         self.button_press_event(event, dblclick=True)
@@ -304,14 +304,14 @@ def button_release_event(self, event):
             elif num == 3:
                 num = 2
 
-        FigureCanvasBase.button_release_event(self, x, y, num, guiEvent=event)
+        super().button_release_event(x, y, num, guiEvent=event)
 
     def scroll_event(self, event):
         x = event.x
         y = self.figure.bbox.height - event.y
         num = getattr(event, 'num', None)
         step = 1 if num == 4 else -1 if num == 5 else 0
-        FigureCanvasBase.scroll_event(self, x, y, step, guiEvent=event)
+        super().scroll_event(x, y, step, guiEvent=event)
 
     def scroll_event_windows(self, event):
         """MouseWheel event processor"""
@@ -399,7 +399,7 @@ class FigureManagerTk(FigureManagerBase):
     """
 
     def __init__(self, canvas, num, window):
-        FigureManagerBase.__init__(self, canvas, num)
+        super().__init__(canvas, num)
         self.window = window
         self.window.withdraw()
         self.set_window_title("Figure %d" % num)
@@ -804,7 +804,7 @@ def trigger(self, *args):
 
 class ConfigureSubplotsTk(backend_tools.ConfigureSubplotsBase):
     def __init__(self, *args, **kwargs):
-        backend_tools.ConfigureSubplotsBase.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.window = None
 
     def trigger(self, *args):

lib/matplotlib/backends/backend_agg.py

@@ -85,7 +85,7 @@ class RendererAgg(RendererBase):
     lock = threading.RLock()
 
     def __init__(self, width, height, dpi):
-        RendererBase.__init__(self)
+        super().__init__()
 
         self.dpi = dpi
         self.width = width

lib/matplotlib/backends/backend_cairo.py

@@ -131,7 +131,7 @@ def __init__(self, dpi):
         self.gc = GraphicsContextCairo(renderer=self)
         self.text_ctx = cairo.Context(
            cairo.ImageSurface(cairo.FORMAT_ARGB32, 1, 1))
-        RendererBase.__init__(self)
+        super().__init__()
 
     @cbook.deprecated("3.4")
     @property
@@ -338,14 +338,14 @@ class GraphicsContextCairo(GraphicsContextBase):
     }
 
     def __init__(self, renderer):
-        GraphicsContextBase.__init__(self)
+        super().__init__()
         self.renderer = renderer
 
     def restore(self):
         self.ctx.restore()
 
     def set_alpha(self, alpha):
-        GraphicsContextBase.set_alpha(self, alpha)
+        super().set_alpha(alpha)
         _alpha = self.get_alpha()
         rgb = self._rgb
         if self.get_forced_alpha():
@@ -391,7 +391,7 @@ def set_dashes(self, offset, dashes):
                 offset)
 
     def set_foreground(self, fg, isRGBA=None):
-        GraphicsContextBase.set_foreground(self, fg, isRGBA)
+        super().set_foreground(fg, isRGBA)
         if len(self._rgb) == 3:
             self.ctx.set_source_rgb(*self._rgb)
         else:

lib/matplotlib/backends/backend_gtk3.py

@@ -54,7 +54,7 @@ class TimerGTK3(TimerBase):
 
     def __init__(self, *args, **kwargs):
         self._timer = None
-        TimerBase.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def _timer_start(self):
         # Need to stop it, otherwise we potentially leak a timer id that will
@@ -74,7 +74,7 @@ def _timer_set_interval(self):
             self._timer_start()
 
     def _on_timer(self):
-        TimerBase._on_timer(self)
+        super()._on_timer()
 
         # Gtk timeout_add() requires that the callback returns True if it
         # is to be called again.
@@ -369,7 +369,7 @@ class FigureManagerGTK3(FigureManagerBase):
 
     """
     def __init__(self, canvas, num):
-        FigureManagerBase.__init__(self, canvas, num)
+        super().__init__(canvas, num)
 
         self.window = Gtk.Window()
         self.window.set_wmclass("matplotlib", "Matplotlib")

lib/matplotlib/backends/backend_nbagg.py

@@ -75,7 +75,7 @@ class FigureManagerNbAgg(FigureManagerWebAgg):
 
     def __init__(self, canvas, num):
         self._shown = False
-        FigureManagerWebAgg.__init__(self, canvas, num)
+        super().__init__(canvas, num)
 
     def display_js(self):
         # XXX How to do this just once? It has to deal with multiple

lib/matplotlib/backends/backend_pdf.py

@@ -2296,7 +2296,7 @@ def new_gc(self):
 class GraphicsContextPdf(GraphicsContextBase):
 
     def __init__(self, file):
-        GraphicsContextBase.__init__(self)
+        super().__init__()
         self._fillcolor = (0.0, 0.0, 0.0)
         self._effective_alphas = (1.0, 1.0)
         self.file = file
@@ -2481,7 +2481,7 @@ def copy_properties(self, other):
         """
         Copy properties of other into self.
         """
-        GraphicsContextBase.copy_properties(self, other)
+        super().copy_properties(other)
         fillcolor = getattr(other, '_fillcolor', self._fillcolor)
         effective_alphas = getattr(other, '_effective_alphas',
                                    self._effective_alphas)

lib/matplotlib/backends/backend_pgf.py

@@ -420,7 +420,7 @@ def __init__(self, figure, fh, dummy=False):
             File handle for the output of the drawing commands.
         """
 
-        RendererBase.__init__(self)
+        super().__init__()
         self.dpi = figure.dpi
         self.fh = fh
         self.figure = figure

lib/matplotlib/backends/backend_ps.py

@@ -761,12 +761,10 @@ def _is_transparent(rgb_or_rgba):
 
 class GraphicsContextPS(GraphicsContextBase):
     def get_capstyle(self):
-        return {'butt': 0, 'round': 1, 'projecting': 2}[
-            GraphicsContextBase.get_capstyle(self)]
+        return {'butt': 0, 'round': 1, 'projecting': 2}[super().get_capstyle()]
 
     def get_joinstyle(self):
-        return {'miter': 0, 'round': 1, 'bevel': 2}[
-            GraphicsContextBase.get_joinstyle(self)]
+        return {'miter': 0, 'round': 1, 'bevel': 2}[super().get_joinstyle()]
 
 
 class _Orientation(Enum):

lib/matplotlib/backends/backend_qt5.py

@@ -182,7 +182,7 @@ def __init__(self, *args, **kwargs):
         # _on_timer method.
         self._timer = QtCore.QTimer()
         self._timer.timeout.connect(self._on_timer)
-        TimerBase.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def __del__(self):
         # The check for deletedness is needed to avoid an error at animation
@@ -516,7 +516,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def closeEvent(self, event):
         self.closing.emit()
-        QtWidgets.QMainWindow.closeEvent(self, event)
+        super().closeEvent(event)
 
 
 class FigureManagerQT(FigureManagerBase):
@@ -534,7 +534,7 @@ class FigureManagerQT(FigureManagerBase):
     """
 
     def __init__(self, canvas, num):
-        FigureManagerBase.__init__(self, canvas, num)
+        super().__init__(canvas, num)
         self.window = MainWindow()
         self.window.closing.connect(canvas.close_event)
         self.window.closing.connect(self._widgetclosed)
@@ -831,7 +831,7 @@ def set_history_buttons(self):
 
 class SubplotToolQt(UiSubplotTool):
     def __init__(self, targetfig, parent):
-        UiSubplotTool.__init__(self, None)
+        super().__init__(None)
 
         self._figure = targetfig
 

lib/matplotlib/backends/backend_svg.py

@@ -295,7 +295,7 @@ def __init__(self, width, height, svgwriter, basename=None, image_dpi=72,
         self._n_gradients = 0
         self._fonts = OrderedDict()
 
-        RendererBase.__init__(self)
+        super().__init__()
         self._glyph_map = dict()
         str_height = short_float_fmt(height)
         str_width = short_float_fmt(width)
@@ -735,8 +735,8 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
         should_do_optimization = \
             len_path + 9 * uses_per_path + 3 < (len_path + 5) * uses_per_path
         if not should_do_optimization:
-            return RendererBase.draw_path_collection(
-                self, gc, master_transform, paths, all_transforms,
+            return super().draw_path_collection(
+                gc, master_transform, paths, all_transforms,
                 offsets, offsetTrans, facecolors, edgecolors,
                 linewidths, linestyles, antialiaseds, urls,
                 offset_position)

lib/matplotlib/backends/backend_webagg_core.py

@@ -121,7 +121,7 @@ class FigureCanvasWebAggCore(backend_agg.FigureCanvasAgg):
     supports_blit = False
 
     def __init__(self, *args, **kwargs):
-        backend_agg.FigureCanvasAgg.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         # Set to True when the renderer contains data that is newer
         # than the PNG buffer.
@@ -379,7 +379,7 @@ def draw_rubberband(self, event, x0, y0, x1, y1):
             "rubberband", x0=x0, y0=y0, x1=x1, y1=y1)
 
     def release_zoom(self, event):
-        backend_bases.NavigationToolbar2.release_zoom(self, event)
+        super().release_zoom(event)
         self.canvas.send_event(
             "rubberband", x0=-1, y0=-1, x1=-1, y1=-1)
 
@@ -406,7 +406,7 @@ class FigureManagerWebAgg(backend_bases.FigureManagerBase):
     ToolbarCls = NavigationToolbar2WebAgg
 
     def __init__(self, canvas, num):
-        backend_bases.FigureManagerBase.__init__(self, canvas, num)
+        super().__init__(canvas, num)
 
         self.web_sockets = set()