Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7e95303

Browse files
authored
Merge pull request#18043 from QuLogic/super2
 Super-ify parts of the code base, part 2
2 parents9720e02 +9ceaf75 commit7e95303

File tree

20 files changed

+97
-102
lines changed

20 files changed

+97
-102
lines changed

‎doc/devel/contributing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ function is a simple pass-through to
409409

410410
# in pylab.py
411411
def text(*args, **kwargs):
412-
ret =gca().text(*args, **kwargs)
412+
ret = gca().text(*args, **kwargs)
413413
draw_if_interactive()
414414
return ret
415415

@@ -427,7 +427,7 @@ illustration) just passes them on to the
427427

428428
# in text.py
429429
def __init__(self, x=0, y=0, text='', **kwargs):
430-
Artist.__init__(self)
430+
super().__init__()
431431
self.update(kwargs)
432432

433433
``update`` does the work looking for methods named like

‎examples/text_labels_and_annotations/line_with_text.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,35 @@ class MyLine(lines.Line2D):
1717
def__init__(self,*args,**kwargs):
1818
# we'll update the position when the line data is set
1919
self.text=mtext.Text(0,0,'')
20-
lines.Line2D.__init__(self,*args,**kwargs)
20+
super().__init__(*args,**kwargs)
2121

2222
# we can't access the label attr until *after* the line is
2323
# initiated
2424
self.text.set_text(self.get_label())
2525

2626
defset_figure(self,figure):
2727
self.text.set_figure(figure)
28-
lines.Line2D.set_figure(self,figure)
28+
super().set_figure(figure)
2929

3030
defset_axes(self,axes):
3131
self.text.set_axes(axes)
32-
lines.Line2D.set_axes(self,axes)
32+
super().set_axes(axes)
3333

3434
defset_transform(self,transform):
3535
# 2 pixel offset
3636
texttrans=transform+mtransforms.Affine2D().translate(2,2)
3737
self.text.set_transform(texttrans)
38-
lines.Line2D.set_transform(self,transform)
38+
super().set_transform(transform)
3939

4040
defset_data(self,x,y):
4141
iflen(x):
4242
self.text.set_position((x[-1],y[-1]))
4343

44-
lines.Line2D.set_data(self,x,y)
44+
super().set_data(x,y)
4545

4646
defdraw(self,renderer):
4747
# draw my label at the end of the line with 2 pixel offset
48-
lines.Line2D.draw(self,renderer)
48+
super().draw(renderer)
4949
self.text.draw(renderer)
5050

5151
# Fixing random state for reproducibility

‎examples/userdemo/colormap_normalizations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
classMidpointNormalize(colors.Normalize):
9595
def__init__(self,vmin=None,vmax=None,midpoint=None,clip=False):
9696
self.midpoint=midpoint
97-
colors.Normalize.__init__(self,vmin,vmax,clip)
97+
super().__init__(vmin,vmax,clip)
9898

9999
def__call__(self,value,clip=None):
100100
# I'm ignoring masked values and all kinds of edge cases to make a

‎lib/matplotlib/colorbar.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,15 +1218,15 @@ def __init__(self, ax, mappable, **kwargs):
12181218
)
12191219
kwargs.setdefault(
12201220
'ticks',ticker.FixedLocator(cs.levels,nbins=10))
1221-
ColorbarBase.__init__(self,ax,**kwargs)
1221+
super().__init__(ax,**kwargs)
12221222
ifnotcs.filled:
12231223
self.add_lines(cs)
12241224
else:
12251225
ifgetattr(mappable.cmap,'colorbar_extend',False)isnotFalse:
12261226
kwargs.setdefault('extend',mappable.cmap.colorbar_extend)
12271227
ifisinstance(mappable,martist.Artist):
12281228
_add_disjoint_kwargs(kwargs,alpha=mappable.get_alpha())
1229-
ColorbarBase.__init__(self,ax,**kwargs)
1229+
super().__init__(ax,**kwargs)
12301230

12311231
@cbook.deprecated("3.3",alternative="update_normal")
12321232
defon_mappable_changed(self,mappable):
@@ -1256,8 +1256,7 @@ def add_lines(self, CS, erase=True):
12561256
tcolors= [c[0]forcinCS.tcolors]
12571257
tlinewidths= [t[0]fortinCS.tlinewidths]
12581258
# Wishlist: Make colorbar lines auto-follow changes in contour lines.
1259-
ColorbarBase.add_lines(self,CS.levels,tcolors,tlinewidths,
1260-
erase=erase)
1259+
super().add_lines(CS.levels,tcolors,tlinewidths,erase=erase)
12611260

12621261
defupdate_normal(self,mappable):
12631262
"""
@@ -1338,7 +1337,7 @@ def remove(self):
13381337
If the colorbar was created with ``use_gridspec=True`` the previous
13391338
gridspec is restored.
13401339
"""
1341-
ColorbarBase.remove(self)
1340+
super().remove()
13421341
self.mappable.callbacksSM.disconnect(self.mappable.colorbar_cid)
13431342
self.mappable.colorbar=None
13441343
self.mappable.colorbar_cid=None
@@ -1606,7 +1605,7 @@ def __init__(self, ax, mappable, **kw):
16061605
# so add a new attribute which will be a list of the
16071606
# colored patches in the colorbar
16081607
self.solids_patches= []
1609-
Colorbar.__init__(self,ax,mappable,**kw)
1608+
super().__init__(ax,mappable,**kw)
16101609

16111610
def_add_solids(self,X,Y,C):
16121611
"""

‎lib/matplotlib/colors.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ def __init__(self, name, segmentdata, N=256, gamma=1.0):
782782
"""
783783
# True only if all colors in map are identical; needed for contouring.
784784
self.monochrome=False
785-
Colormap.__init__(self,name,N)
785+
super().__init__(name,N)
786786
self._segmentdata=segmentdata
787787
self._gamma=gamma
788788

@@ -940,7 +940,7 @@ def __init__(self, colors, name='from_list', N=None):
940940
else:
941941
self.colors= [gray]*N
942942
self.monochrome=True
943-
Colormap.__init__(self,name,N)
943+
super().__init__(name,N)
944944

945945
def_init(self):
946946
self._lut=np.zeros((self.N+3,4),float)
@@ -1335,7 +1335,7 @@ class PowerNorm(Normalize):
13351335
a power-law normalization over that range.
13361336
"""
13371337
def__init__(self,gamma,vmin=None,vmax=None,clip=False):
1338-
Normalize.__init__(self,vmin,vmax,clip)
1338+
super().__init__(vmin,vmax,clip)
13391339
self.gamma=gamma
13401340

13411341
def__call__(self,value,clip=None):

‎lib/matplotlib/contour.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ClabelText(text.Text):
4242

4343
defget_rotation(self):
4444
new_angle,=self.get_transform().transform_angles(
45-
[text.Text.get_rotation(self)], [self.get_position()])
45+
[super().get_rotation()], [self.get_position()])
4646
returnnew_angle
4747

4848

‎lib/matplotlib/dviread.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ class Vf(Dvi):
629629
"""
630630

631631
def__init__(self,filename):
632-
Dvi.__init__(self,filename,0)
632+
super().__init__(filename,0)
633633
try:
634634
self._first_font=None
635635
self._chars= {}

‎lib/matplotlib/legend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ def __init__(self, parent, handles, labels,
365365
frommatplotlib.axesimportAxes
366366
frommatplotlib.figureimportFigure
367367

368-
Artist.__init__(self)
368+
super().__init__()
369369

370370
ifpropisNone:
371371
iffontsizeisnotNone:

‎lib/matplotlib/legend_handler.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def __init__(self, marker_pad=0.3, numpoints=None, **kw):
147147
-----
148148
Any other keyword arguments are given to `HandlerBase`.
149149
"""
150-
HandlerBase.__init__(self,**kw)
150+
super().__init__(**kw)
151151

152152
self._numpoints=numpoints
153153
self._marker_pad=marker_pad
@@ -193,7 +193,7 @@ def __init__(self, numpoints=None, yoffsets=None, **kw):
193193
-----
194194
Any other keyword arguments are given to `HandlerNpoints`.
195195
"""
196-
HandlerNpoints.__init__(self,numpoints=numpoints,**kw)
196+
super().__init__(numpoints=numpoints,**kw)
197197
self._yoffsets=yoffsets
198198

199199
defget_ydata(self,legend,xdescent,ydescent,width,height,fontsize):
@@ -223,8 +223,7 @@ def __init__(self, marker_pad=0.3, numpoints=None, **kw):
223223
-----
224224
Any other keyword arguments are given to `HandlerNpoints`.
225225
"""
226-
HandlerNpoints.__init__(self,marker_pad=marker_pad,
227-
numpoints=numpoints,**kw)
226+
super().__init__(marker_pad=marker_pad,numpoints=numpoints,**kw)
228227

229228
defcreate_artists(self,legend,orig_handle,
230229
xdescent,ydescent,width,height,fontsize,
@@ -280,7 +279,7 @@ def patch_func(legend=legend, orig_handle=orig_handle,
280279
-----
281280
Any other keyword arguments are given to `HandlerBase`.
282281
"""
283-
HandlerBase.__init__(self,**kw)
282+
super().__init__(**kw)
284283
self._patch_func=patch_func
285284

286285
def_create_patch(self,legend,orig_handle,
@@ -339,7 +338,7 @@ class HandlerRegularPolyCollection(HandlerNpointsYoffsets):
339338
r"""Handler for `.RegularPolyCollection`\s."""
340339

341340
def__init__(self,yoffsets=None,sizes=None,**kw):
342-
HandlerNpointsYoffsets.__init__(self,yoffsets=yoffsets,**kw)
341+
super().__init__(yoffsets=yoffsets,**kw)
343342

344343
self._sizes=sizes
345344

@@ -439,8 +438,7 @@ def __init__(self, xerr_size=0.5, yerr_size=None,
439438
self._xerr_size=xerr_size
440439
self._yerr_size=yerr_size
441440

442-
HandlerLine2D.__init__(self,marker_pad=marker_pad,
443-
numpoints=numpoints,**kw)
441+
super().__init__(marker_pad=marker_pad,numpoints=numpoints,**kw)
444442

445443
defget_err_size(self,legend,xdescent,ydescent,
446444
width,height,fontsize):
@@ -564,10 +562,8 @@ def __init__(self, marker_pad=0.3, numpoints=None,
564562
Any other keyword arguments are given to `HandlerNpointsYoffsets`.
565563
"""
566564

567-
HandlerNpointsYoffsets.__init__(self,marker_pad=marker_pad,
568-
numpoints=numpoints,
569-
yoffsets=yoffsets,
570-
**kw)
565+
super().__init__(marker_pad=marker_pad,numpoints=numpoints,
566+
yoffsets=yoffsets,**kw)
571567
self._bottom=bottom
572568

573569
defget_ydata(self,legend,xdescent,ydescent,width,height,fontsize):
@@ -652,7 +648,7 @@ class HandlerTuple(HandlerBase):
652648
def__init__(self,ndivide=1,pad=None,**kwargs):
653649
self._ndivide=ndivide
654650
self._pad=pad
655-
HandlerBase.__init__(self,**kwargs)
651+
super().__init__(**kwargs)
656652

657653
defcreate_artists(self,legend,orig_handle,
658654
xdescent,ydescent,width,height,fontsize,

‎lib/matplotlib/lines.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ def __init__(self, xdata, ydata,
300300
:meth:`set_drawstyle` for a description of the draw styles.
301301
302302
"""
303-
Artist.__init__(self)
303+
super().__init__()
304304

305305
#convert sequences to numpy arrays
306306
ifnotnp.iterable(xdata):
@@ -721,7 +721,7 @@ def set_transform(self, t):
721721
----------
722722
t : `matplotlib.transforms.Transform`
723723
"""
724-
Artist.set_transform(self,t)
724+
super().set_transform(t)
725725
self._invalidx=True
726726
self._invalidy=True
727727
self.stale=True
@@ -1276,7 +1276,7 @@ def set_dashes(self, seq):
12761276

12771277
defupdate_from(self,other):
12781278
"""Copy properties from *other* to self."""
1279-
Artist.update_from(self,other)
1279+
super().update_from(other)
12801280
self._linestyle=other._linestyle
12811281
self._linewidth=other._linewidth
12821282
self._color=other._color

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp