Jul 25, 2020 · Jul 23, 2020 · Jul 23, 2020 · Jul 23, 2020 · Jul 23, 2020 · Jul 23, 2020
diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst

  # in pylab.py
  def text(*args, **kwargs):
      ret =gca().text(*args, **kwargs)
      ret = gca().text(*args, **kwargs)
      draw_if_interactive()
      return ret


  # in text.py
  def __init__(self, x=0, y=0, text='', **kwargs):
 Artist.__init__(self)
 super().__init__()
      self.update(kwargs)

 ``update`` does the work looking for methods named like
diff --git a/examples/text_labels_and_annotations/line_with_text.py b/examples/text_labels_and_annotations/line_with_text.py
    def __init__(self, *args, **kwargs):
        # we'll update the position when the line data is set
        self.text = mtext.Text(0, 0, '')
 lines.Line2D.__init__(self,*args, **kwargs)
 super().__init__(*args, **kwargs)

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

    def set_figure(self, figure):
        self.text.set_figure(figure)
 lines.Line2D.set_figure(self,figure)
 super().set_figure(figure)

    def set_axes(self, axes):
        self.text.set_axes(axes)
 lines.Line2D.set_axes(self,axes)
 super().set_axes(axes)

    def set_transform(self, transform):
        # 2 pixel offset
        texttrans = transform + mtransforms.Affine2D().translate(2, 2)
        self.text.set_transform(texttrans)
 lines.Line2D.set_transform(self,transform)
 super().set_transform(transform)

    def set_data(self, x, y):
        if len(x):
            self.text.set_position((x[-1], y[-1]))

 lines.Line2D.set_data(self,x, y)
 super().set_data(x, y)

    def draw(self, renderer):
        # draw my label at the end of the line with 2 pixel offset
 lines.Line2D.draw(self,renderer)
 super().draw(renderer)
        self.text.draw(renderer)

 # Fixing random state for reproducibility
diff --git a/examples/userdemo/colormap_normalizations.py b/examples/userdemo/colormap_normalizations.py
 class MidpointNormalize(colors.Normalize):
    def __init__(self, vmin=None, vmax=None, midpoint=None, clip=False):
        self.midpoint = midpoint
 colors.Normalize.__init__(self,vmin, vmax, clip)
 super().__init__(vmin, vmax, clip)

    def __call__(self, value, clip=None):
        # I'm ignoring masked values and all kinds of edge cases to make a
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
            )
            kwargs.setdefault(
                'ticks', ticker.FixedLocator(cs.levels, nbins=10))
 ColorbarBase.__init__(self,ax, **kwargs)
 super().__init__(ax, **kwargs)
            if not cs.filled:
                self.add_lines(cs)
        else:
            if getattr(mappable.cmap, 'colorbar_extend', False) is not False:
                kwargs.setdefault('extend', mappable.cmap.colorbar_extend)
            if isinstance(mappable, martist.Artist):
                _add_disjoint_kwargs(kwargs, alpha=mappable.get_alpha())
 ColorbarBase.__init__(self,ax, **kwargs)
 super().__init__(ax, **kwargs)

    @cbook.deprecated("3.3", alternative="update_normal")
    def on_mappable_changed(self, mappable):
        tcolors = [c[0] for c in CS.tcolors]
        tlinewidths = [t[0] for t in CS.tlinewidths]
        # Wishlist: Make colorbar lines auto-follow changes in contour lines.
        ColorbarBase.add_lines(self, CS.levels, tcolors, tlinewidths,
                               erase=erase)
        super().add_lines(CS.levels, tcolors, tlinewidths, erase=erase)

    def update_normal(self, mappable):
        """
        If the colorbar was created with ``use_gridspec=True`` the previous
        gridspec is restored.
        """
 ColorbarBase.remove(self)
 super().remove()
        self.mappable.callbacksSM.disconnect(self.mappable.colorbar_cid)
        self.mappable.colorbar = None
        self.mappable.colorbar_cid = None
        # so add a new attribute which will be a list of the
        # colored patches in the colorbar
        self.solids_patches = []
 Colorbar.__init__(self,ax, mappable, **kw)
 super().__init__(ax, mappable, **kw)

    def _add_solids(self, X, Y, C):
        """
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
        """
        # True only if all colors in map are identical; needed for contouring.
        self.monochrome = False
 Colormap.__init__(self,name, N)
 super().__init__(name, N)
        self._segmentdata = segmentdata
        self._gamma = gamma

                else:
                    self.colors = [gray] * N
                self.monochrome = True
 Colormap.__init__(self,name, N)
 super().__init__(name, N)

    def _init(self):
        self._lut = np.zeros((self.N + 3, 4), float)
    a power-law normalization over that range.
    """
    def __init__(self, gamma, vmin=None, vmax=None, clip=False):
 Normalize.__init__(self,vmin, vmax, clip)
 super().__init__(vmin, vmax, clip)
        self.gamma = gamma

    def __call__(self, value, clip=None):
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py

    def get_rotation(self):
        new_angle, = self.get_transform().transform_angles(
            [text.Text.get_rotation(self)], [self.get_position()])
            [super().get_rotation()], [self.get_position()])
        return new_angle


diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
    """

    def __init__(self, filename):
 Dvi.__init__(self,filename, 0)
 super().__init__(filename, 0)
        try:
            self._first_font = None
            self._chars = {}
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
        from matplotlib.axes import Axes
        from matplotlib.figure import Figure

 Artist.__init__(self)
 super().__init__()

        if prop is None:
            if fontsize is not None:
diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py
        -----
        Any other keyword arguments are given to `HandlerBase`.
        """
 HandlerBase.__init__(self,**kw)
 super().__init__(**kw)

        self._numpoints = numpoints
        self._marker_pad = marker_pad
        -----
        Any other keyword arguments are given to `HandlerNpoints`.
        """
 HandlerNpoints.__init__(self,numpoints=numpoints, **kw)
 super().__init__(numpoints=numpoints, **kw)
        self._yoffsets = yoffsets

    def get_ydata(self, legend, xdescent, ydescent, width, height, fontsize):
        -----
        Any other keyword arguments are given to `HandlerNpoints`.
        """
        HandlerNpoints.__init__(self, marker_pad=marker_pad,
                                numpoints=numpoints, **kw)
        super().__init__(marker_pad=marker_pad, numpoints=numpoints, **kw)

    def create_artists(self, legend, orig_handle,
                       xdescent, ydescent, width, height, fontsize,
        -----
        Any other keyword arguments are given to `HandlerBase`.
        """
 HandlerBase.__init__(self,**kw)
 super().__init__(**kw)
        self._patch_func = patch_func

    def _create_patch(self, legend, orig_handle,
    r"""Handler for `.RegularPolyCollection`\s."""

    def __init__(self, yoffsets=None, sizes=None, **kw):
 HandlerNpointsYoffsets.__init__(self,yoffsets=yoffsets, **kw)
 super().__init__(yoffsets=yoffsets, **kw)

        self._sizes = sizes

        self._xerr_size = xerr_size
        self._yerr_size = yerr_size

        HandlerLine2D.__init__(self, marker_pad=marker_pad,
                               numpoints=numpoints, **kw)
        super().__init__(marker_pad=marker_pad, numpoints=numpoints, **kw)

    def get_err_size(self, legend, xdescent, ydescent,
                     width, height, fontsize):
        Any other keyword arguments are given to `HandlerNpointsYoffsets`.
        """

        HandlerNpointsYoffsets.__init__(self, marker_pad=marker_pad,
                                        numpoints=numpoints,
                                        yoffsets=yoffsets,
                                        **kw)
        super().__init__(marker_pad=marker_pad, numpoints=numpoints,
                         yoffsets=yoffsets, **kw)
        self._bottom = bottom

    def get_ydata(self, legend, xdescent, ydescent, width, height, fontsize):
    def __init__(self, ndivide=1, pad=None, **kwargs):
        self._ndivide = ndivide
        self._pad = pad
 HandlerBase.__init__(self,**kwargs)
 super().__init__(**kwargs)

    def create_artists(self, legend, orig_handle,
                       xdescent, ydescent, width, height, fontsize,
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
        :meth:`set_drawstyle` for a description of the draw styles.

        """
 Artist.__init__(self)
 super().__init__()

        #convert sequences to numpy arrays
        if not np.iterable(xdata):
        ----------
        t : `matplotlib.transforms.Transform`
        """
 Artist.set_transform(self,t)
 super().set_transform(t)
        self._invalidx = True
        self._invalidy = True
        self.stale = True

    def update_from(self, other):
        """Copy properties from *other* to self."""
 Artist.update_from(self,other)
 super().update_from(other)
        self._linestyle = other._linestyle
        self._linewidth = other._linewidth
        self._color = other._color
Original file line number	Diff line number	Diff line change
Expand Up		@@ -409,7 +409,7 @@ function is a simple pass-through to

		# in pylab.py
		def text(args, *kwargs):
		ret =gca().text(args, *kwargs)
		ret = gca().text(args, *kwargs)
		draw_if_interactive()
		return ret

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

		# in text.py
		def __init__(self, x=0, y=0, text='', **kwargs):
		Artist.__init__(self)
		super().__init__()
		self.update(kwargs)

		``update`` does the work looking for methods named like
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,35 +17,35 @@ class MyLine(lines.Line2D):
		def __init__(self, args, *kwargs):
		# we'll update the position when the line data is set
		self.text = mtext.Text(0, 0, '')
		lines.Line2D.__init__(self,args, *kwargs)
		super().__init__(args, *kwargs)

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

		def set_figure(self, figure):
		self.text.set_figure(figure)
		lines.Line2D.set_figure(self,figure)
		super().set_figure(figure)

		def set_axes(self, axes):
		self.text.set_axes(axes)
		lines.Line2D.set_axes(self,axes)
		super().set_axes(axes)

		def set_transform(self, transform):
		# 2 pixel offset
		texttrans = transform + mtransforms.Affine2D().translate(2, 2)
		self.text.set_transform(texttrans)
		lines.Line2D.set_transform(self,transform)
		super().set_transform(transform)

		def set_data(self, x, y):
		if len(x):
		self.text.set_position((x[-1], y[-1]))

		lines.Line2D.set_data(self,x, y)
		super().set_data(x, y)

		def draw(self, renderer):
		# draw my label at the end of the line with 2 pixel offset
		lines.Line2D.draw(self,renderer)
		super().draw(renderer)
		self.text.draw(renderer)

		# Fixing random state for reproducibility
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -94,7 +94,7 @@
		class MidpointNormalize(colors.Normalize):
		def __init__(self, vmin=None, vmax=None, midpoint=None, clip=False):
		self.midpoint = midpoint
		colors.Normalize.__init__(self,vmin, vmax, clip)
		super().__init__(vmin, vmax, clip)

		def __call__(self, value, clip=None):
		# I'm ignoring masked values and all kinds of edge cases to make a
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1218,15 +1218,15 @@ def __init__(self, ax, mappable, **kwargs):
		)
		kwargs.setdefault(
		'ticks', ticker.FixedLocator(cs.levels, nbins=10))
		ColorbarBase.__init__(self,ax, **kwargs)
		super().__init__(ax, **kwargs)
		if not cs.filled:
		self.add_lines(cs)
		else:
		if getattr(mappable.cmap, 'colorbar_extend', False) is not False:
		kwargs.setdefault('extend', mappable.cmap.colorbar_extend)
		if isinstance(mappable, martist.Artist):
		_add_disjoint_kwargs(kwargs, alpha=mappable.get_alpha())
		ColorbarBase.__init__(self,ax, **kwargs)
		super().__init__(ax, **kwargs)

		@cbook.deprecated("3.3", alternative="update_normal")
		def on_mappable_changed(self, mappable):
Expand DownExpand Up		@@ -1256,8 +1256,7 @@ def add_lines(self, CS, erase=True):
		tcolors = [c[0] for c in CS.tcolors]
		tlinewidths = [t[0] for t in CS.tlinewidths]
		# Wishlist: Make colorbar lines auto-follow changes in contour lines.
		ColorbarBase.add_lines(self, CS.levels, tcolors, tlinewidths,
		erase=erase)
		super().add_lines(CS.levels, tcolors, tlinewidths, erase=erase)

		def update_normal(self, mappable):
		"""
Expand DownExpand Up		@@ -1338,7 +1337,7 @@ def remove(self):
		If the colorbar was created with ``use_gridspec=True`` the previous
		gridspec is restored.
		"""
		ColorbarBase.remove(self)
		super().remove()
		self.mappable.callbacksSM.disconnect(self.mappable.colorbar_cid)
		self.mappable.colorbar = None
		self.mappable.colorbar_cid = None
Expand DownExpand Up		@@ -1606,7 +1605,7 @@ def __init__(self, ax, mappable, **kw):
		# so add a new attribute which will be a list of the
		# colored patches in the colorbar
		self.solids_patches = []
		Colorbar.__init__(self,ax, mappable, **kw)
		super().__init__(ax, mappable, **kw)

		def _add_solids(self, X, Y, C):
		"""
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -782,7 +782,7 @@ def __init__(self, name, segmentdata, N=256, gamma=1.0):
		"""
		# True only if all colors in map are identical; needed for contouring.
		self.monochrome = False
		Colormap.__init__(self,name, N)
		super().__init__(name, N)
		self._segmentdata = segmentdata
		self._gamma = gamma

Expand DownExpand Up		@@ -940,7 +940,7 @@ def __init__(self, colors, name='from_list', N=None):
		else:
		self.colors = [gray] * N
		self.monochrome = True
		Colormap.__init__(self,name, N)
		super().__init__(name, N)

		def _init(self):
		self._lut = np.zeros((self.N + 3, 4), float)
Expand DownExpand Up		@@ -1335,7 +1335,7 @@ class PowerNorm(Normalize):
		a power-law normalization over that range.
		"""
		def __init__(self, gamma, vmin=None, vmax=None, clip=False):
		Normalize.__init__(self,vmin, vmax, clip)
		super().__init__(vmin, vmax, clip)
		self.gamma = gamma

		def __call__(self, value, clip=None):
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,7 +42,7 @@ class ClabelText(text.Text):

		def get_rotation(self):
		new_angle, = self.get_transform().transform_angles(
		[text.Text.get_rotation(self)], [self.get_position()])
		[super().get_rotation()], [self.get_position()])
		return new_angle


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -629,7 +629,7 @@ class Vf(Dvi):
		"""

		def __init__(self, filename):
		Dvi.__init__(self,filename, 0)
		super().__init__(filename, 0)
		try:
		self._first_font = None
		self._chars = {}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -365,7 +365,7 @@ def __init__(self, parent, handles, labels,
		from matplotlib.axes import Axes
		from matplotlib.figure import Figure

		Artist.__init__(self)
		super().__init__()

		if prop is None:
		if fontsize is not None:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -147,7 +147,7 @@ def __init__(self, marker_pad=0.3, numpoints=None, **kw):
		-----
		Any other keyword arguments are given to `HandlerBase`.
		"""
		HandlerBase.__init__(self,**kw)
		super().__init__(**kw)

		self._numpoints = numpoints
		self._marker_pad = marker_pad
Expand DownExpand Up		@@ -193,7 +193,7 @@ def __init__(self, numpoints=None, yoffsets=None, **kw):
		-----
		Any other keyword arguments are given to `HandlerNpoints`.
		"""
		HandlerNpoints.__init__(self,numpoints=numpoints, **kw)
		super().__init__(numpoints=numpoints, **kw)
		self._yoffsets = yoffsets

		def get_ydata(self, legend, xdescent, ydescent, width, height, fontsize):
Expand DownExpand Up		@@ -223,8 +223,7 @@ def __init__(self, marker_pad=0.3, numpoints=None, **kw):
		-----
		Any other keyword arguments are given to `HandlerNpoints`.
		"""
		HandlerNpoints.__init__(self, marker_pad=marker_pad,
		numpoints=numpoints, **kw)
		super().__init__(marker_pad=marker_pad, numpoints=numpoints, **kw)

		def create_artists(self, legend, orig_handle,
		xdescent, ydescent, width, height, fontsize,
Expand DownExpand Up		@@ -280,7 +279,7 @@ def patch_func(legend=legend, orig_handle=orig_handle,
		-----
		Any other keyword arguments are given to `HandlerBase`.
		"""
		HandlerBase.__init__(self,**kw)
		super().__init__(**kw)
		self._patch_func = patch_func

		def _create_patch(self, legend, orig_handle,
Expand DownExpand Up		@@ -339,7 +338,7 @@ class HandlerRegularPolyCollection(HandlerNpointsYoffsets):
		r"""Handler for `.RegularPolyCollection`\s."""

		def __init__(self, yoffsets=None, sizes=None, **kw):
		HandlerNpointsYoffsets.__init__(self,yoffsets=yoffsets, **kw)
		super().__init__(yoffsets=yoffsets, **kw)

		self._sizes = sizes

Expand DownExpand Up		@@ -439,8 +438,7 @@ def __init__(self, xerr_size=0.5, yerr_size=None,
		self._xerr_size = xerr_size
		self._yerr_size = yerr_size

		HandlerLine2D.__init__(self, marker_pad=marker_pad,
		numpoints=numpoints, **kw)
		super().__init__(marker_pad=marker_pad, numpoints=numpoints, **kw)

		def get_err_size(self, legend, xdescent, ydescent,
		width, height, fontsize):
Expand DownExpand Up		@@ -564,10 +562,8 @@ def __init__(self, marker_pad=0.3, numpoints=None,
		Any other keyword arguments are given to `HandlerNpointsYoffsets`.
		"""

		HandlerNpointsYoffsets.__init__(self, marker_pad=marker_pad,
		numpoints=numpoints,
		yoffsets=yoffsets,
		**kw)
		super().__init__(marker_pad=marker_pad, numpoints=numpoints,
		yoffsets=yoffsets, **kw)
		self._bottom = bottom

		def get_ydata(self, legend, xdescent, ydescent, width, height, fontsize):
Expand DownExpand Up		@@ -652,7 +648,7 @@ class HandlerTuple(HandlerBase):
		def __init__(self, ndivide=1, pad=None, **kwargs):
		self._ndivide = ndivide
		self._pad = pad
		HandlerBase.__init__(self,**kwargs)
		super().__init__(**kwargs)

		def create_artists(self, legend, orig_handle,
		xdescent, ydescent, width, height, fontsize,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -300,7 +300,7 @@ def __init__(self, xdata, ydata,
		:meth:`set_drawstyle` for a description of the draw styles.

		"""
		Artist.__init__(self)
		super().__init__()

		#convert sequences to numpy arrays
		if not np.iterable(xdata):
Expand DownExpand Up		@@ -721,7 +721,7 @@ def set_transform(self, t):
		----------
		t : `matplotlib.transforms.Transform`
		"""
		Artist.set_transform(self,t)
		super().set_transform(t)
		self._invalidx = True
		self._invalidy = True
		self.stale = True
Expand DownExpand Up		@@ -1276,7 +1276,7 @@ def set_dashes(self, seq):

		def update_from(self, other):
		"""Copy properties from other to self."""
		Artist.update_from(self,other)
		super().update_from(other)
		self._linestyle = other._linestyle
		self._linewidth = other._linewidth
		self._color = other._color
Expand Down