matplotlib · timhoffm · Aug 7, 2020 · Jul 23, 2020 · Jul 23, 2020 · Jul 23, 2020
diff --git a/examples/user_interfaces/embedding_in_wx2_sgskip.py b/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)

diff --git a/examples/user_interfaces/embedding_in_wx3_sgskip.py b/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)

diff --git a/examples/user_interfaces/embedding_in_wx4_sgskip.py b/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)

diff --git a/examples/user_interfaces/embedding_in_wx5_sgskip.py b/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)

diff --git a/examples/user_interfaces/fourier_demo_wx_sgskip.py b/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

diff --git a/examples/user_interfaces/mathtext_wx_sgskip.py b/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)

diff --git a/examples/user_interfaces/wxcursor_demo_sgskip.py b/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)

diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
@@ -187,7 +187,7 @@ class ToolToggleBase(ToolBase):

    def __init__(self, *args, **kwargs):
        self._toggled = kwargs.pop('toggled', self.default_toggled)
-        ToolBase.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)

    def trigger(self, sender, event, data=None):
        """Calls `enable` or `disable` based on `toggled` value."""
@@ -235,7 +235,7 @@ def set_figure(self, figure):
                # if no figure the internal state is not changed
                # we change it here so next call to trigger will change it back
                self._toggled = False
-        ToolBase.set_figure(self, figure)
+        super().set_figure(figure)
        if toggled:
            if figure:
                self.trigger(self, None)
@@ -253,7 +253,7 @@ class SetCursorBase(ToolBase):
    `set_cursor` when a tool gets triggered.
    """
    def __init__(self, *args, **kwargs):
-        ToolBase.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
        self._id_drag = None
        self._cursor = None
        self._default_cursor = cursors.POINTER
@@ -268,7 +268,7 @@ def __init__(self, *args, **kwargs):
    def set_figure(self, figure):
        if self._id_drag:
            self.canvas.mpl_disconnect(self._id_drag)
-        ToolBase.set_figure(self, figure)
+        super().set_figure(figure)
        if figure:
            self._id_drag = self.canvas.mpl_connect(
                'motion_notify_event', self._set_cursor_cbk)
@@ -324,12 +324,12 @@ class ToolCursorPosition(ToolBase):
    """
    def __init__(self, *args, **kwargs):
        self._id_drag = None
-        ToolBase.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)

    def set_figure(self, figure):
        if self._id_drag:
            self.canvas.mpl_disconnect(self._id_drag)
-        ToolBase.set_figure(self, figure)
+        super().set_figure(figure)
        if figure:
            self._id_drag = self.canvas.mpl_connect(
                'motion_notify_event', self.send_message)
@@ -473,7 +473,7 @@ class AxisScaleBase(ToolToggleBase):
    def trigger(self, sender, event, data=None):
        if event.inaxes is None:
            return
-        ToolToggleBase.trigger(self, sender, event, data)
+        super().trigger(sender, event, data)

    def enable(self, event):
        self.set_scale(event.inaxes, 'log')
@@ -522,7 +522,7 @@ def __init__(self, *args, **kwargs):
        self.views = WeakKeyDictionary()
        self.positions = WeakKeyDictionary()
        self.home_views = WeakKeyDictionary()
-        ToolBase.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)

    def add_figure(self, figure):
        """Add the current figure to the stack of views and positions."""
@@ -719,7 +719,7 @@ class SaveFigureBase(ToolBase):
 class ZoomPanBase(ToolToggleBase):
    """Base class for `ToolZoom` and `ToolPan`."""
    def __init__(self, *args):
-        ToolToggleBase.__init__(self, *args)
+        super().__init__(*args)
        self._button_pressed = None
        self._xypress = None
        self._idPress = None
@@ -749,7 +749,7 @@ def disable(self, event):

    def trigger(self, sender, event, data=None):
        self.toolmanager.get_tool(_views_positions).add_figure(self.figure)
-        ToolToggleBase.trigger(self, sender, event, data)
+        super().trigger(sender, event, data)

    def scroll_zoom(self, event):
        # https://gist.github.com/tacaswell/3144287
@@ -790,7 +790,7 @@ class ToolZoom(ZoomPanBase):
    radio_group = 'default'

    def __init__(self, *args):
-        ZoomPanBase.__init__(self, *args)
+        super().__init__(*args)
        self._ids_zoom = []

    def _cancel_action(self):
@@ -916,7 +916,7 @@ class ToolPan(ZoomPanBase):
    radio_group = 'default'

    def __init__(self, *args):
-        ZoomPanBase.__init__(self, *args)
+        super().__init__(*args)
        self._id_drag = None

    def _cancel_action(self):

diff --git a/lib/matplotlib/backends/_backend_tk.py b/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):

diff --git a/lib/matplotlib/backends/backend_agg.py b/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

diff --git a/lib/matplotlib/backends/backend_cairo.py b/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:

diff --git a/lib/matplotlib/backends/backend_gtk3.py b/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")

diff --git a/lib/matplotlib/backends/backend_nbagg.py b/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

diff --git a/lib/matplotlib/backends/backend_pdf.py b/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)

diff --git a/lib/matplotlib/backends/backend_pgf.py b/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

diff --git a/lib/matplotlib/backends/backend_ps.py b/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):