8000 Switch to argumentless (py3) super(). · matplotlib/matplotlib@9a9f68f · GitHub
[go: up one dir, main page]
Skip to content

Commit 9a9f68f

Browse files
anntzeranntzer
committed
Switch to argumentless (py3) super().
1 parent 637b649 commit 9a9f68f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+246
-318
lines changed

‎examples/api/radar_chart.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,18 @@ class RadarAxes(PolarAxes):
6060
draw_patch = patch_dict[frame]
6161

6262
def __init__(self, *args, **kwargs):
63-
super(RadarAxes, self).__init__(*args, **kwargs)
63+
super().__init__(*args, **kwargs)
6464
# rotate plot such that the first axis is at the top
6565
self.set_theta_zero_location('N')
6666

6767
def fill(self, *args, **kwargs):
6868
"""Override fill so that line is closed by default"""
6969
closed = kwargs.pop('closed', True)
70-
return super(RadarAxes, self).fill(closed=closed, *args, **kwargs)
70+
return super().fill(closed=closed, *args, **kwargs)
7171

7272
def plot(self, *args, **kwargs):
7373
"""Override plot so that line is closed by default"""
74-
lines = super(RadarAxes, self).plot(*args, **kwargs)
74+
lines = super().plot(*args, **kwargs)
7575
for line in lines:
7676
self._close_line(line)
7777

‎examples/api/skewt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def update_position(self, loc):
2828
# This ensures that the new value of the location is set before
2929
# any other updates take place
3030
self._loc = loc
31-
super(SkewXTick, self).update_position(loc)
31+
super().update_position(loc)
3232

3333
def _has_default_loc(self):
3434
return self.get_loc() is None

‎examples/misc/anchored_artists.py

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,18 @@
44
================
55
66
"""
7-
from matplotlib.patches import Rectangle, Ellipse
87

9-
from matplotlib.offsetbox import AnchoredOffsetbox, AuxTransformBox, VPacker,\
10-
TextArea, DrawingArea
8+
from matplotlib.patches import Rectangle, Ellipse
9+
from matplotlib.offsetbox import (
10+
AnchoredOffsetbox, AuxTransformBox, DrawingArea, TextArea, VPacker)
1111

1212

1313
class AnchoredText(AnchoredOffsetbox):
1414
def __init__(self, s, loc, pad=0.4, borderpad=0.5,
1515
prop=None, frameon=True):
16-
17-
self.txt = TextArea(s,
18-
minimumdescent=False)
19-
20-
super(AnchoredText, self).__init__(loc, pad=pad, borderpad=borderpad,
21-
child=self.txt,
22-
prop=prop,
23-
frameon=frameon)
16+
self.txt = TextArea(s, minimumdescent=False)
17+
super().__init__(loc, pad=pad, borderpad=borderpad,
18+
child=self.txt, prop=prop, frameon=frameon)
2419

2520

2621
class AnchoredSizeBar(AnchoredOffsetbox):
@@ -42,10 +37,8 @@ def __init__(self, transform, size, label, loc,
4237
align="center",
4338
pad=0, sep=sep)
4439

45-
AnchoredOffsetbox.__init__(self, loc, pad=pad, borderpad=borderpad,
46-
child=self._box,
47-
prop=prop,
48-
frameon=frameon)
40+
super().__init__(loc, pad=pad, borderpad=borderpad,
41+
child=self._box, prop=prop, frameon=frameon)
4942

5043

5144
class AnchoredEllipse(AnchoredOffsetbox):
@@ -59,24 +52,16 @@ def __init__(self, transform, width, height, angle, loc,
5952
self._box = AuxTransformBox(transform)
6053
self.ellipse = Ellipse((0, 0), width, height, angle)
6154
self._box.add_artist(self.ellipse)
62-
63-
AnchoredOffsetbox.__init__(self, loc, pad=pad, borderpad=borderpad,
64-
child=self._box,
65-
prop=prop,
66-
frameon=frameon)
55+
super().__init__(loc, pad=pad, borderpad=borderpad,
56+
child=self._box, prop=prop, frameon=frameon)
6757

6858

6959
class AnchoredDrawingArea(AnchoredOffsetbox):
7060
def __init__(self, width, height, xdescent, ydescent,
7161
loc, pad=0.4, borderpad=0.5, prop=None, frameon=True):
72-
7362
self.da = DrawingArea(width, height, xdescent, ydescent)
74-
75-
super(AnchoredDrawingArea, self).__init__(loc, pad=pad,
76-
borderpad=borderpad,
77-
child=self.da,
78-
prop=None,
79-
frameon=frameon)
63+
super().__init__(loc, pad=pad, borderpad=borderpad,
64+
child=self.da, prop=None, frameon=frameon)
8065

8166

8267
if __name__ == "__main__":

‎examples/user_interfaces/embedding_in_qt_sgskip.py

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

2727
class ApplicationWindow(QtWidgets.QMainWindow):
2828
def __init__(self):
29-
super(ApplicationWindow, self).__init__()
29+
super().__init__()
3030
self._main = QtWidgets.QWidget()
3131
self.setCentralWidget(self._main)
3232
layout = QtWidgets.QVBoxLayout(self._main)

‎examples/user_interfaces/embedding_webagg_sgskip.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,9 @@ def send_binary(self, blob):
214214

215215
def __init__(self, figure):
216216
self.figure = figure
217-
self.manager = new_figure_manager_given_figure(
218-
id(figure), figure)
217+
self.manager = new_figure_manager_given_figure(id(figure), figure)
219218

220-
super(MyApplication, self).__init__([
219+
super().__init__([
221220
# Static files for the CSS and JS
222221
(r'/_static/(.*)',
223222
tornado.web.StaticFileHandler,

‎examples/userdemo/custom_boxstyle02.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(self, pad=0.3):
2626
"""
2727

2828
self.pad = pad
29-
super(MyStyle, self).__init__()
29+
super().__init__()
3030

3131
def transmute(self, x0, y0, width, height, mutation_size):
3232
"""

‎lib/matplotlib/animation.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ def isAvailable(cls):
586586
def __init__(self, *args, **kwargs):
587587
if kwargs.get("extra_args") is None:
588588
kwargs["extra_args"] = ()
589-
super(PillowWriter, self).__init__(*args, **kwargs)
589+
super().__init__(*args, **kwargs)
590590

591591
def setup(self, fig, outfile, dpi=None):
592592
self._frames = []
@@ -782,7 +782,7 @@ def isAvailable(cls):
782782
bin_path = cls.bin_path()
783783
if bin_path == "convert":
784784
cls._init_from_registry()
785-
return super(ImageMagickBase, cls).isAvailable()
785+
return super().isAvailable()
786786

787787
ImageMagickBase._init_from_registry()
788788

@@ -877,8 +877,7 @@ def __init__(self, fps=30, codec=None, bitrate=None, extra_args=None,
877877
self._saved_frames = []
878878
self._total_bytes = 0
879879
self._hit_limit = False
880-
super(HTMLWriter, self).__init__(fps, codec, bitrate,
881-
extra_args, metadata)
880+
super().__init__(fps, codec, bitrate, extra_args, metadata)
882881

883882
def setup(self, fig, outfile, dpi, frame_dir=None):
884883
root, ext = os.path.splitext(outfile)
@@ -894,8 +893,7 @@ def setup(self, fig, outfile, dpi, frame_dir=None):
894893
else:
895894
frame_prefix = None
896895

897-
super(HTMLWriter, self).setup(fig, outfile, dpi,
898-
frame_prefix, clear_temp=False)
896+
super().setup(fig, outfile, dpi, frame_prefix, clear_temp=False)
899897

900898
def grab_frame(self, **savefig_kwargs):
901899
if self.embed_frames:
@@ -919,7 +917,7 @@ def grab_frame(self, **savefig_kwargs):
919917
else:
920918
self._saved_frames.append(imgdata64)
921919
else:
922-
return super(HTMLWriter, self).grab_frame(**savefig_kwargs)
920+
return super().grab_frame(**savefig_kwargs)
923921

924922
def _run(self):
925923
# make a duck-typed subprocess stand in

‎lib/matplotlib/axes/_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ def __init__(self, fig, rect,
583583
def __getstate__(self):
584584
# The renderer should be re-created by the figure, and then cached at
585585
# that point.
586-
state = super(_AxesBase, self).__getstate__()
586+
state = super().__getstate__()
587587
state['_cachedRenderer'] = None
588588
state.pop('_layoutbox')
589589
state.pop('_poslayoutbox')

‎lib/matplotlib/backends/backend_agg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ def draw(self):
431431
self.figure.draw(self.renderer)
432432
# A GUI class may be need to update a window using this draw, so
433433
# don't forget to call the superclass.
434-
super(FigureCanvasAgg, self).draw()
434+
super().draw()
435435
finally:
436436
# if toolbar:
437437
# toolbar.set_cursor(toolbar._lastCursor)

‎lib/matplotlib/backends/backend_gtk.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,8 +771,8 @@ def __init__ (self,
771771
filetypes = [],
772772
default_filetype = None
773773
):
774-
super(FileChooserDialog, self).__init__(title, parent, action, buttons)
775-
super(FileChooserDialog, self).set_do_overwrite_confirmation(True)
774+
super().__init__(title, parent, action, buttons)
775+
super().set_do_overwrite_confirmation(True)
776776
self.set_default_response(gtk.RESPONSE_OK)
777777

778778
if not path:

‎lib/matplotlib/backends/backend_gtkagg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def __init__(self, *args, **kwargs):
4343
'Matplotlib usage FAQ for more info on '
4444
'backends.'),
4545
alternative='GTK3Agg')
46-
super(FigureCanvasGTKAgg, self).__init__(*args, **kwargs)
46+
super().__init__(*args, **kwargs)
4747

4848
def configure_event(self, widget, event=None):
4949

‎lib/matplotlib/backends/backend_gtkcairo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def __init__(self, *args, **kwargs):
4141
'Matplotlib usage FAQ for more info on '
4242
'backends.'),
4343
alternative='GTK3Cairo')
44-
super(FigureCanvasGTKCairo, self).__init__(*args, **kwargs)
44+
super().__init__(*args, **kwargs)
4545

4646
def _renderer_init(self):
4747
"""Override to use cairo (rather than GDK) renderer"""

‎lib/matplotlib/backends/backend_nbagg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def get_javascript(cls, stream=None):
112112
output = io.StringIO()
113113
else:
114114
output = stream
115-
super(FigureManagerNbAgg, cls).get_javascript(stream=output)
115+
super().get_javascript(stream=output)
116116
with io.open(os.path.join(
117117
os.path.dirname(__file__),
118118
"web_backend", 'js',

‎lib/matplotlib/backends/backend_qt5.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class FigureCanvasQT(QtWidgets.QWidget, FigureCanvasBase):
232232
@_allow_super_init
233233
def __init__(self, figure):
234234
_create_qApp()
235-
super(FigureCanvasQT, self).__init__(figure=figure)
235+
super().__init__(figure=figure)
236236

237237
self.figure = figure
238238
# We don't want to scale up the figure DPI more than once.
@@ -492,7 +492,7 @@ def draw(self):
492492
return
493493
self._is_drawing = True
494494
try:
495-
super(FigureCanvasQT, self).draw()
495+
super().draw()
496496
finally:
497497
self._is_drawing = False
498498
self.update()
@@ -762,7 +762,7 @@ def _init_toolbar(self):
762762
# the actual sizeHint, so override it instead in order to make the
763763
# aesthetic adjustments noted above.
764764
def sizeHint(self):
765-
size = super(NavigationToolbar2QT, self).sizeHint()
765+
size = super().sizeHint()
766766
size.setHeight(max(48, size.height()))
767767
return size
768768

@@ -798,11 +798,11 @@ def _update_buttons_checked(self):
798798
self._actions['zoom'].setChecked(self._active == 'ZOOM')
799799

800800
def pan(self, *args):
801-
super(NavigationToolbar2QT, self).pan(*args)
801+
super().pan(*args)
802802
self._update_buttons_checked()
803803

804804
def zoom(self, *args):
805-
super(NavigationToolbar2QT, self).zoom(*args)
805+
super().zoom(*args)
806806
self._update_buttons_checked()
807807

808808
def set_message(self, s):

‎lib/matplotlib/backends/backend_qt5agg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
class FigureCanvasQTAgg(FigureCanvasAgg, FigureCanvasQT):
2222

2323
def __init__(self, figure):
24-
super(FigureCanvasQTAgg, self).__init__(figure=figure)
24+
super().__init__(figure=figure)
2525
self._bbox_queue = []
2626

2727
@property
@@ -91,7 +91,7 @@ def blit(self, bbox=None):
9191
self.repaint(l, self.renderer.height / self._dpi_ratio - t, w, h)
9292

9393
def print_figure(self, *args, **kwargs):
94-
super(FigureCanvasQTAgg, self).print_figure(*args, **kwargs)
94+
super().print_figure(*args, **kwargs)
9595
self.draw()
9696

9797

‎lib/matplotlib/backends/backend_qt5cairo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
class FigureCanvasQTCairo(FigureCanvasQT, FigureCanvasCairo):
1010
def __init__(self, figure):
11-
super(FigureCanvasQTCairo, self).__init__(figure=figure)
11+
super().__init__(figure=figure)
1212
self._renderer = RendererCairo(self.figure.dpi)
1313
self._renderer.set_width_height(-1, -1) # Invalid values.
1414

1515
def draw(self):
1616
if hasattr(self._renderer.gc, "ctx"):
1717
self.figure.draw(self._renderer)
18-
super(FigureCanvasQTCairo, self).draw()
18+
super().draw()
1919

2020
def paintEvent(self, event):
2121
self._update_dpi()

‎lib/matplotlib/backends/backend_webagg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def __init__(self, url_prefix=''):
183183
assert url_prefix[0] == '/' and url_prefix[-1] != '/', \
184184
'url_prefix must start with a "/" and not end with one.'
185185

186-
super(WebAggApplication, self).__init__(
186+
super().__init__(
187187
[
188188
# Static files for the CSS and JS
189189
(url_prefix + r'/_static/(.*)',

‎lib/matplotlib/backends/backend_wx.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -824,8 +824,7 @@ def gui_repaint(self, drawDC=None, origin='WX'):
824824
filetypes['xpm'] = 'X pixmap'
825825

826826
def print_figure(self, filename, *args, **kwargs):
827-
super(_FigureCanvasWxBase, self).print_figure(
828-
filename, *args, **kwargs)
827+
super().print_figure(filename, *args, **kwargs)
829828
# Restore the current view; this is needed because the artist contains
830829
# methods rely on particular attributes of the rendered figure for
831830
# determining things like bounding boxes.
@@ -1986,7 +1985,7 @@ def new_figure_manager(cls, num, *args, **kwargs):
19861985
# Retain a reference to the app object so that it does not get
19871986
# garbage collected.
19881987
_BackendWx._theWxApp = wxapp
1989-
return super(_BackendWx, cls).new_figure_manager(num, *args, **kwargs)
1988+
return super().new_figure_manager(num, *args, **kwargs)
19901989

19911990
@classmethod
19921991
def new_figure_manager_given_figure(cls, num, figure):

‎lib/matplotlib/backends/qt_editor/formsubplottool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
class UiSubplotTool(QtWidgets.QDialog):
55

66
def __init__(self, *args, **kwargs):
7-
super(UiSubplotTool, self).__init__(*args, **kwargs)
7+
super().__init__(*args, **kwargs)
88
self.setObjectName("SubplotTool")
99
self._widgets = {}
1010

‎lib/matplotlib/colors.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@
6262

6363
class _ColorMapping(dict):
6464
def __init__(self, mapping):
65-
super(_ColorMapping, self).__init__(mapping)
65+
super().__init__(mapping)
6666
self.cache = {}
6767

6868
def __setitem__(self, key, value):
69-
super(_ColorMapping, self).__setitem__(key, value)
69+
super().__setitem__(key, value)
7070
self.cache.clear()
7171

7272
def __delitem__(self, key):
73-
super(_ColorMapping, self).__delitem__(key)
73+
super().__delitem__(key)
7474
self.cache.clear()
7575

7676

‎lib/matplotlib/dates.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ def __init__(self, fmt, encoding='utf-8'):
366366
fmt: any valid strptime format is supported
367367
encoding: encoding to use on byte input (default: 'utf-8')
368368
"""
369-
super(bytespdate2num, self).__init__(fmt)
369+
super().__init__(fmt)
370370
self.encoding = encoding
371371

372372
def __call__(self, b):
@@ -377,7 +377,7 @@ def __call__(self, b):
377377
A date2num float
378378
"""
379379
s = b.decode(self.encoding)
380-
return super(bytespdate2num, self).__call__(s)
380+
return super().__call__(s)
381381

382382

383383
# a version of dateutil.parser.parse that can operate on nump0y arrays

0 commit comments

Comments
 (0)
0