Expire parameter renaming deprecations

Author: oscargus

lib/matplotlib/image.py

@@ -1129,11 +1129,9 @@ def get_extent(self):
             raise RuntimeError('Must set data first')
         return self._Ax[0], self._Ax[-1], self._Ay[0], self._Ay[-1]
 
-    @_api.rename_parameter("3.8", "s", "filternorm")
     def set_filternorm(self, filternorm):
         pass
 
-    @_api.rename_parameter("3.8", "s", "filterrad")
     def set_filterrad(self, filterrad):
         pass
 

lib/matplotlib/legend.py

@@ -1196,7 +1196,6 @@ def _find_best_position(self, width, height, renderer):
 
         return l, b
 
-    @_api.rename_parameter("3.8", "event", "mouseevent")
     def contains(self, mouseevent):
         return self.legendPatch.contains(mouseevent)
 

lib/matplotlib/projections/geo.py

@@ -258,7 +258,6 @@ class AitoffAxes(GeoAxes):
     class AitoffTransform(_GeoTransform):
         """The base Aitoff transform."""
 
-        @_api.rename_parameter("3.8", "ll", "values")
         def transform_non_affine(self, values):
             # docstring inherited
             longitude, latitude = values.T
@@ -280,7 +279,6 @@ def inverted(self):
 
     class InvertedAitoffTransform(_GeoTransform):
 
-        @_api.rename_parameter("3.8", "xy", "values")
         def transform_non_affine(self, values):
             # docstring inherited
             # MGDTODO: Math is hard ;(
@@ -306,7 +304,6 @@ class HammerAxes(GeoAxes):
     class HammerTransform(_GeoTransform):
         """The base Hammer transform."""
 
-        @_api.rename_parameter("3.8", "ll", "values")
         def transform_non_affine(self, values):
             # docstring inherited
             longitude, latitude = values.T
@@ -324,7 +321,6 @@ def inverted(self):
 
     class InvertedHammerTransform(_GeoTransform):
 
-        @_api.rename_parameter("3.8", "xy", "values")
         def transform_non_affine(self, values):
             # docstring inherited
             x, y = values.T
@@ -353,7 +349,6 @@ class MollweideAxes(GeoAxes):
     class MollweideTransform(_GeoTransform):
         """The base Mollweide transform."""
 
-        @_api.rename_parameter("3.8", "ll", "values")
         def transform_non_affine(self, values):
             # docstring inherited
             def d(theta):
@@ -394,7 +389,6 @@ def inverted(self):
 
     class InvertedMollweideTransform(_GeoTransform):
 
-        @_api.rename_parameter("3.8", "xy", "values")
         def transform_non_affine(self, values):
             # docstring inherited
             x, y = values.T
@@ -435,7 +429,6 @@ def __init__(self, center_longitude, center_latitude, resolution):
             self._center_longitude = center_longitude
             self._center_latitude = center_latitude
 
-        @_api.rename_parameter("3.8", "ll", "values")
         def transform_non_affine(self, values):
             # docstring inherited
             longitude, latitude = values.T
@@ -469,7 +462,6 @@ def __init__(self, center_longitude, center_latitude, resolution):
             self._center_longitude = center_longitude
             self._center_latitude = center_latitude
 
-        @_api.rename_parameter("3.8", "xy", "values")
         def transform_non_affine(self, values):
             # docstring inherited
             x, y = values.T

lib/matplotlib/projections/polar.py

@@ -79,7 +79,6 @@ def _get_rorigin(self):
         return self._scale_transform.transform(
             (0, self._axis.get_rorigin()))[1]
 
-    @_api.rename_parameter("3.8", "tr", "values")
     def transform_non_affine(self, values):
         # docstring inherited
         theta, r = np.transpose(values)
@@ -235,7 +234,6 @@ def __init__(self, axis=None, use_rmin=True,
         use_rmin="_use_rmin",
         apply_theta_transforms="_apply_theta_transforms")
 
-    @_api.rename_parameter("3.8", "xy", "values")
     def transform_non_affine(self, values):
         # docstring inherited
         x, y = values.T

lib/matplotlib/scale.py

@@ -213,7 +213,6 @@ def __str__(self):
         return "{}(base={}, nonpositive={!r})".format(
             type(self).__name__, self.base, "clip" if self._clip else "mask")
 
-    @_api.rename_parameter("3.8", "a", "values")
     def transform_non_affine(self, values):
         # Ignore invalid values due to nans being passed to the transform.
         with np.errstate(divide="ignore", invalid="ignore"):
@@ -250,7 +249,6 @@ def __init__(self, base):
     def __str__(self):
         return f"{type(self).__name__}(base={self.base})"
 
-    @_api.rename_parameter("3.8", "a", "values")
     def transform_non_affine(self, values):
         return np.power(self.base, values)
 
@@ -362,7 +360,6 @@ def __init__(self, base, linthresh, linscale):
         self._linscale_adj = (linscale / (1.0 - self.base ** -1))
         self._log_base = np.log(base)
 
-    @_api.rename_parameter("3.8", "a", "values")
     def transform_non_affine(self, values):
         abs_a = np.abs(values)
         with np.errstate(divide="ignore", invalid="ignore"):
@@ -390,7 +387,6 @@ def __init__(self, base, linthresh, linscale):
         self.linscale = linscale
         self._linscale_adj = (linscale / (1.0 - self.base ** -1))
 
-    @_api.rename_parameter("3.8", "a", "values")
     def transform_non_affine(self, values):
         abs_a = np.abs(values)
         with np.errstate(divide="ignore", invalid="ignore"):
@@ -472,7 +468,6 @@ def __init__(self, linear_width):
                              "must be strictly positive")
         self.linear_width = linear_width
 
-    @_api.rename_parameter("3.8", "a", "values")
     def transform_non_affine(self, values):
         return self.linear_width * np.arcsinh(values / self.linear_width)
 
@@ -488,7 +483,6 @@ def __init__(self, linear_width):
         super().__init__()
         self.linear_width = linear_width
 
-    @_api.rename_parameter("3.8", "a", "values")
     def transform_non_affine(self, values):
         return self.linear_width * np.sinh(values / self.linear_width)
 
@@ -589,7 +583,6 @@ def __init__(self, nonpositive='mask'):
         self._nonpositive = nonpositive
         self._clip = {"clip": True, "mask": False}[nonpositive]
 
-    @_api.rename_parameter("3.8", "a", "values")
     def transform_non_affine(self, values):
         """logit transform (base 10), masked or clipped"""
         with np.errstate(divide="ignore", invalid="ignore"):
@@ -613,7 +606,6 @@ def __init__(self, nonpositive='mask'):
         super().__init__()
         self._nonpositive = nonpositive
 
-    @_api.rename_parameter("3.8", "a", "values")
     def transform_non_affine(self, values):
         """logistic transform (base 10)"""
         return 1.0 / (1 + 10**(-values))

lib/matplotlib/table.py

@@ -103,7 +103,6 @@ def __init__(self, xy, width, height, *,
                           text=text, fontproperties=fontproperties,
                           horizontalalignment=loc, verticalalignment='center')
 
-    @_api.rename_parameter("3.8", "trans", "t")
     def set_transform(self, t):
         super().set_transform(t)
         # the text does not get the transform!

lib/matplotlib/text.py

@@ -1848,7 +1848,6 @@ def transform(renderer) -> Transform
         # Must come last, as some kwargs may be propagated to arrow_patch.
         Text.__init__(self, x, y, text, **kwargs)
 
-    @_api.rename_parameter("3.8", "event", "mouseevent")
     def contains(self, mouseevent):
         if self._different_canvas(mouseevent):
             return False, {}

lib/matplotlib/transforms.py

@@ -606,7 +606,6 @@ def expanded(self, sw, sh):
         a = np.array([[-deltaw, -deltah], [deltaw, deltah]])
         return Bbox(self._points + a)
 
-    @_api.rename_parameter("3.8", "p", "w_pad")
     def padded(self, w_pad, h_pad=None):
         """
         Construct a `Bbox` by padding this one on all four sides.
@@ -1799,7 +1798,6 @@ def transform_affine(self, values):
         raise NotImplementedError('Affine subclasses should override this '
                                   'method.')
 
-    @_api.rename_parameter("3.8", "points", "values")
     def transform_non_affine(self, values):
         # docstring inherited
         return values
@@ -1857,7 +1855,6 @@ def to_values(self):
         mtx = self.get_matrix()
         return tuple(mtx[:2].swapaxes(0, 1).flat)
 
-    @_api.rename_parameter("3.8", "points", "values")
     def transform_affine(self, values):
         mtx = self.get_matrix()
         if isinstance(values, np.ma.MaskedArray):
@@ -1868,7 +1865,6 @@ def transform_affine(self, values):
     if DEBUG:
         _transform_affine = transform_affine
 
-        @_api.rename_parameter("3.8", "points", "values")
         def transform_affine(self, values):
             # docstring inherited
             # The major speed trap here is just converting to the
@@ -2131,17 +2127,14 @@ def get_matrix(self):
         # docstring inherited
         return self._mtx
 
-    @_api.rename_parameter("3.8", "points", "values")
     def transform(self, values):
         # docstring inherited
         return np.asanyarray(values)
 
-    @_api.rename_parameter("3.8", "points", "values")
     def transform_affine(self, values):
         # docstring inherited
         return np.asanyarray(values)
 
-    @_api.rename_parameter("3.8", "points", "values")
     def transform_non_affine(self, values):
         # docstring inherited
         return np.asanyarray(values)
@@ -2230,7 +2223,6 @@ def frozen(self):
         # docstring inherited
         return blended_transform_factory(self._x.frozen(), self._y.frozen())
 
-    @_api.rename_parameter("3.8", "points", "values")
     def transform_non_affine(self, values):
         # docstring inherited
         if self._x.is_affine and self._y.is_affine:
@@ -2423,12 +2415,10 @@ def contains_branch_seperately(self, other_transform):
 
     __str__ = _make_str_method("_a", "_b")
 
-    @_api.rename_parameter("3.8", "points", "values")
     def transform_affine(self, values):
         # docstring inherited
         return self.get_affine().transform(values)
 
-    @_api.rename_parameter("3.8", "points", "values")
     def transform_non_affine(self, values):
         # docstring inherited
         if self._a.is_affine and self._b.is_affine: