Skip to content

Commit 99619e3

Browse files
committed
Use super() in backend classes and examples.
1 parent 493400d commit 99619e3

20 files changed

+67
-72
lines changed

examples/user_interfaces/embedding_in_wx2_sgskip.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020

2121
class CanvasFrame(wx.Frame):
2222
def __init__(self):
23-
wx.Frame.__init__(self, None, -1,
24-
'CanvasFrame', size=(550, 350))
23+
super().__init__(None, -1, 'CanvasFrame', size=(550, 350))
2524

2625
self.figure = Figure()
2726
self.axes = self.figure.add_subplot(111)

examples/user_interfaces/embedding_in_wx3_sgskip.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
class PlotPanel(wx.Panel):
3939
def __init__(self, parent):
40-
wx.Panel.__init__(self, parent, -1)
40+
super().__init__(parent, -1)
4141

4242
self.fig = Figure((5, 4), 75)
4343
self.canvas = FigureCanvas(self, -1, self.fig)

examples/user_interfaces/embedding_in_wx4_sgskip.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class MyNavigationToolbar(NavigationToolbar):
2121
"""Extend the default wx toolbar with your own event handlers."""
2222

2323
def __init__(self, canvas):
24-
NavigationToolbar.__init__(self, canvas)
24+
super().__init__(canvas)
2525
# We use a stock wx bitmap, but you could also use your own image file.
2626
bmp = wx.ArtProvider.GetBitmap(wx.ART_CROSS_MARK, wx.ART_TOOLBAR)
2727
tool = self.AddTool(wx.ID_ANY, 'Click me', bmp,
@@ -41,8 +41,7 @@ def _on_custom(self, event):
4141

4242
class CanvasFrame(wx.Frame):
4343
def __init__(self):
44-
wx.Frame.__init__(self, None, -1,
45-
'CanvasFrame', size=(550, 350))
44+
super().__init__(None, -1, 'CanvasFrame', size=(550, 350))
4645

4746
self.figure = Figure(figsize=(5, 4), dpi=100)
4847
self.axes = self.figure.add_subplot(111)

examples/user_interfaces/embedding_in_wx5_sgskip.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
class Plot(wx.Panel):
1919
def __init__(self, parent, id=-1, dpi=None, **kwargs):
20-
wx.Panel.__init__(self, parent, id=id, **kwargs)
20+
super().__init__(parent, id=id, **kwargs)
2121
self.figure = mpl.figure.Figure(dpi=dpi, figsize=(2, 2))
2222
self.canvas = FigureCanvas(self, -1, self.figure)
2323
self.toolbar = NavigationToolbar(self.canvas)
@@ -31,7 +31,7 @@ def __init__(self, parent, id=-1, dpi=None, **kwargs):
3131

3232
class PlotNotebook(wx.Panel):
3333
def __init__(self, parent, id=-1):
34-
wx.Panel.__init__(self, parent, id=id)
34+
super().__init__(parent, id=id)
3535
self.nb = aui.AuiNotebook(self)
3636
sizer = wx.BoxSizer()
3737
sizer.Add(self.nb, 1, wx.EXPAND)

examples/user_interfaces/fourier_demo_wx_sgskip.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def setKnob(self, value):
104104

105105
class FourierDemoFrame(wx.Frame):
106106
def __init__(self, *args, **kwargs):
107-
wx.Frame.__init__(self, *args, **kwargs)
107+
super().__init__(*args, **kwargs)
108108
panel = wx.Panel(self)
109109

110110
# create the GUI elements

examples/user_interfaces/mathtext_wx_sgskip.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def mathtext_to_wxbitmap(s):
4040

4141
class CanvasFrame(wx.Frame):
4242
def __init__(self, parent, title):
43-
wx.Frame.__init__(self, parent, -1, title, size=(550, 350))
43+
super().__init__(parent, -1, title, size=(550, 350))
4444

4545
self.figure = Figure()
4646
self.axes = self.figure.add_subplot(111)

examples/user_interfaces/wxcursor_demo_sgskip.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class CanvasFrame(wx.Frame):
1818
def __init__(self, ):
19-
wx.Frame.__init__(self, None, -1, 'CanvasFrame', size=(550, 350))
19+
super().__init__(None, -1, 'CanvasFrame', size=(550, 350))
2020

2121
self.figure = Figure()
2222
self.axes = self.figure.add_subplot(111)

lib/matplotlib/backends/_backend_tk.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class TimerTk(TimerBase):
7777

7878
def __init__(self, parent, *args, **kwargs):
7979
self._timer = None
80-
TimerBase.__init__(self, *args, **kwargs)
80+
super().__init__(*args, **kwargs)
8181
self.parent = parent
8282

8383
def _timer_start(self):
@@ -90,7 +90,7 @@ def _timer_stop(self):
9090
self._timer = None
9191

9292
def _on_timer(self):
93-
TimerBase._on_timer(self)
93+
super()._on_timer()
9494
# Tk after() is only a single shot, so we need to add code here to
9595
# reset the timer if we're not operating in single shot mode. However,
9696
# if _timer is None, this means that _timer_stop has been called; so
@@ -263,13 +263,13 @@ def motion_notify_event(self, event):
263263
x = event.x
264264
# flipy so y=0 is bottom of canvas
265265
y = self.figure.bbox.height - event.y
266-
FigureCanvasBase.motion_notify_event(self, x, y, guiEvent=event)
266+
super().motion_notify_event(x, y, guiEvent=event)
267267

268268
def enter_notify_event(self, event):
269269
x = event.x
270270
# flipy so y=0 is bottom of canvas
271271
y = self.figure.bbox.height - event.y
272-
FigureCanvasBase.enter_notify_event(self, guiEvent=event, xy=(x, y))
272+
super().enter_notify_event(guiEvent=event, xy=(x, y))
273273

274274
def button_press_event(self, event, dblclick=False):
275275
x = event.x
@@ -284,8 +284,8 @@ def button_press_event(self, event, dblclick=False):
284284
elif num == 3:
285285
num = 2
286286

287-
FigureCanvasBase.button_press_event(
288-
self, x, y, num, dblclick=dblclick, guiEvent=event)
287+
super().button_press_event(x, y, num,
288+
dblclick=dblclick, guiEvent=event)
289289

290290
def button_dblclick_event(self, event):
291291
self.button_press_event(event, dblclick=True)
@@ -304,14 +304,14 @@ def button_release_event(self, event):
304304
elif num == 3:
305305
num = 2
306306

307-
FigureCanvasBase.button_release_event(self, x, y, num, guiEvent=event)
307+
super().button_release_event(x, y, num, guiEvent=event)
308308

309309
def scroll_event(self, event):
310310
x = event.x
311311
y = self.figure.bbox.height - event.y
312312
num = getattr(event, 'num', None)
313313
step = 1 if num == 4 else -1 if num == 5 else 0
314-
FigureCanvasBase.scroll_event(self, x, y, step, guiEvent=event)
314+
super().scroll_event(x, y, step, guiEvent=event)
315315

316316
def scroll_event_windows(self, event):
317317
"""MouseWheel event processor"""
@@ -399,7 +399,7 @@ class FigureManagerTk(FigureManagerBase):
399399
"""
400400

401401
def __init__(self, canvas, num, window):
402-
FigureManagerBase.__init__(self, canvas, num)
402+
super().__init__(canvas, num)
403403
self.window = window
404404
self.window.withdraw()
405405
self.set_window_title("Figure %d" % num)
@@ -804,7 +804,7 @@ def trigger(self, *args):
804804

805805
class ConfigureSubplotsTk(backend_tools.ConfigureSubplotsBase):
806806
def __init__(self, *args, **kwargs):
807-
backend_tools.ConfigureSubplotsBase.__init__(self, *args, **kwargs)
807+
super().__init__(*args, **kwargs)
808808
self.window = None
809809

810810
def trigger(self, *args):

lib/matplotlib/backends/backend_agg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class RendererAgg(RendererBase):
8585
lock = threading.RLock()
8686

8787
def __init__(self, width, height, dpi):
88-
RendererBase.__init__(self)
88+
super().__init__()
8989

9090
self.dpi = dpi
9191
self.width = width

lib/matplotlib/backends/backend_cairo.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def __init__(self, dpi):
131131
self.gc = GraphicsContextCairo(renderer=self)
132132
self.text_ctx = cairo.Context(
133133
cairo.ImageSurface(cairo.FORMAT_ARGB32, 1, 1))
134-
RendererBase.__init__(self)
134+
super().__init__()
135135

136136
@cbook.deprecated("3.4")
137137
@property
@@ -338,14 +338,14 @@ class GraphicsContextCairo(GraphicsContextBase):
338338
}
339339

340340
def __init__(self, renderer):
341-
GraphicsContextBase.__init__(self)
341+
super().__init__()
342342
self.renderer = renderer
343343

344344
def restore(self):
345345
self.ctx.restore()
346346

347347
def set_alpha(self, alpha):
348-
GraphicsContextBase.set_alpha(self, alpha)
348+
super().set_alpha(alpha)
349349
_alpha = self.get_alpha()
350350
rgb = self._rgb
351351
if self.get_forced_alpha():
@@ -391,7 +391,7 @@ def set_dashes(self, offset, dashes):
391391
offset)
392392

393393
def set_foreground(self, fg, isRGBA=None):
394-
GraphicsContextBase.set_foreground(self, fg, isRGBA)
394+
super().set_foreground(fg, isRGBA)
395395
if len(self._rgb) == 3:
396396
self.ctx.set_source_rgb(*self._rgb)
397397
else:

0 commit comments

Comments
 (0)