Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 640604d

Browse files
timhoffmtimhoffm
authored
Merge pull request #18190 from QuLogic/super-backends
Use `super()` more in backends
2 parents 9b7f94f + 99619e3 commit 640604d

22 files changed

+89
-96
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/backend_tools.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class ToolToggleBase(ToolBase):
187187

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

192192
def trigger(self, sender, event, data=None):
193193
"""Calls `enable` or `disable` based on `toggled` value."""
@@ -235,7 +235,7 @@ def set_figure(self, figure):
235235
# if no figure the internal state is not changed
236236
# we change it here so next call to trigger will change it back
237237
self._toggled = False
238-
ToolBase.set_figure(self, figure)
238+
super().set_figure(figure)
239239
if toggled:
240240
if figure:
241241
self.trigger(self, None)
@@ -253,7 +253,7 @@ class SetCursorBase(ToolBase):
253253
`set_cursor` when a tool gets triggered.
254254
"""
255255
def __init__(self, *args, **kwargs):
256-
ToolBase.__init__(self, *args, **kwargs)
256+
super().__init__(*args, **kwargs)
257257
self._id_drag = None
258258
self._cursor = None
259259
self._default_cursor = cursors.POINTER
@@ -268,7 +268,7 @@ def __init__(self, *args, **kwargs):
268268
def set_figure(self, figure):
269269
if self._id_drag:
270270
self.canvas.mpl_disconnect(self._id_drag)
271-
ToolBase.set_figure(self, figure)
271+
super().set_figure(figure)
272272
if figure:
273273
self._id_drag = self.canvas.mpl_connect(
274274
'motion_notify_event', self._set_cursor_cbk)
@@ -324,12 +324,12 @@ class ToolCursorPosition(ToolBase):
324324
"""
325325
def __init__(self, *args, **kwargs):
326326
self._id_drag = None
327-
ToolBase.__init__(self, *args, **kwargs)
327+
super().__init__(*args, **kwargs)
328328

329329
def set_figure(self, figure):
330330
if self._id_drag:
331331
self.canvas.mpl_disconnect(self._id_drag)
332-
ToolBase.set_figure(self, figure)
332+
super().set_figure(figure)
333333
if figure:
334334
self._id_drag = self.canvas.mpl_connect(
335335
'motion_notify_event', self.send_message)
@@ -473,7 +473,7 @@ class AxisScaleBase(ToolToggleBase):
473473
def trigger(self, sender, event, data=None):
474474
if event.inaxes is None:
475475
return
476-
ToolToggleBase.trigger(self, sender, event, data)
476+
super().trigger(sender, event, data)
477477

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

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

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

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

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

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

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

922922
def _cancel_action(self):

‎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"""
@@ -401,7 +401,7 @@ class FigureManagerTk(FigureManagerBase):
401401
_owns_mainloop = False
402402

403403
def __init__(self, canvas, num, window):
404-
FigureManagerBase.__init__(self, canvas, num)
404+
super().__init__(canvas, num)
405405
self.window = window
406406
self.window.withdraw()
407407
self.set_window_title("Figure %d" % num)
@@ -803,7 +803,7 @@ def trigger(self, *args):
803803

804804
class ConfigureSubplotsTk(backend_tools.ConfigureSubplotsBase):
805805
def __init__(self, *args, **kwargs):
806-
backend_tools.ConfigureSubplotsBase.__init__(self, *args, **kwargs)
806+
super().__init__(*args, **kwargs)
807807
self.window = None
808808

809809
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:

‎lib/matplotlib/backends/backend_gtk3.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class TimerGTK3(TimerBase):
5454

5555
def __init__(self, *args, **kwargs):
5656
self._timer = None
57-
TimerBase.__init__(self, *args, **kwargs)
57+
super().__init__(*args, **kwargs)
5858

5959
def _timer_start(self):
6060
# Need to stop it, otherwise we potentially leak a timer id that will
@@ -74,7 +74,7 @@ def _timer_set_interval(self):
7474
self._timer_start()
7575

7676
def _on_timer(self):
77-
TimerBase._on_timer(self)
77+
super()._on_timer()
7878

7979
# Gtk timeout_add() requires that the callback returns True if it
8080
# is to be called again.
@@ -369,7 +369,7 @@ class FigureManagerGTK3(FigureManagerBase):
369369
370370
"""
371371
def __init__(self, canvas, num):
372-
FigureManagerBase.__init__(self, canvas, num)
372+
super().__init__(canvas, num)
373373

374374
self.window = Gtk.Window()
375375
self.window.set_wmclass("matplotlib", "Matplotlib")

‎lib/matplotlib/backends/backend_nbagg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class FigureManagerNbAgg(FigureManagerWebAgg):
7575

7676
def __init__(self, canvas, num):
7777
self._shown = False
78-
FigureManagerWebAgg.__init__(self, canvas, num)
78+
super().__init__(canvas, num)
7979

8080
def display_js(self):
8181
# XXX How to do this just once? It has to deal with multiple

‎lib/matplotlib/backends/backend_pdf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2296,7 +2296,7 @@ def new_gc(self):
22962296
class GraphicsContextPdf(GraphicsContextBase):
22972297

22982298
def __init__(self, file):
2299-
GraphicsContextBase.__init__(self)
2299+
super().__init__()
23002300
self._fillcolor = (0.0, 0.0, 0.0)
23012301
self._effective_alphas = (1.0, 1.0)
23022302
self.file = file
@@ -2481,7 +2481,7 @@ def copy_properties(self, other):
24812481
"""
24822482
Copy properties of other into self.
24832483
"""
2484-
GraphicsContextBase.copy_properties(self, other)
2484+
super().copy_properties(other)
24852485
fillcolor = getattr(other, '_fillcolor', self._fillcolor)
24862486
effective_alphas = getattr(other, '_effective_alphas',
24872487
self._effective_alphas)

‎lib/matplotlib/backends/backend_pgf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ def __init__(self, figure, fh, dummy=False):
420420
File handle for the output of the drawing commands.
421421
"""
422422

423-
RendererBase.__init__(self)
423+
super().__init__()
424424
self.dpi = figure.dpi
425425
self.fh = fh
426426
self.figure = figure

‎lib/matplotlib/backends/backend_ps.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -761,12 +761,10 @@ def _is_transparent(rgb_or_rgba):
761761

762762
class GraphicsContextPS(GraphicsContextBase):
763763
def get_capstyle(self):
764-
return {'butt': 0, 'round': 1, 'projecting': 2}[
765-
GraphicsContextBase.get_capstyle(self)]
764+
return {'butt': 0, 'round': 1, 'projecting': 2}[super().get_capstyle()]
766765

767766
def get_joinstyle(self):
768-
return {'miter': 0, 'round': 1, 'bevel': 2}[
769-
GraphicsContextBase.get_joinstyle(self)]
767+
return {'miter': 0, 'round': 1, 'bevel': 2}[super().get_joinstyle()]
770768

771769

772770
class _Orientation(Enum):

0 commit comments

Comments
 (0)