Unify pickradius arguments and checking

oscargus · oscargus · commit 17c018beb4ff · 2023-01-16T10:50:41.000+01:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -640,8 +640,7 @@ def __str__(self):
         return "{}({},{})".format(
             type(self).__name__, *self.axes.transAxes.transform((0, 0)))
 
-    @_api.make_keyword_only("3.6", name="pickradius")
-    def __init__(self, axes, pickradius=15):
+    def __init__(self, axes, *, pickradius=15):
         """
         Parameters
         ----------
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -418,7 +418,6 @@ def draw(self, renderer):
         renderer.close_group(self.__class__.__name__)
         self.stale = False
 
-    @_api.rename_parameter("3.6", "pr", "pickradius")
     def set_pickradius(self, pickradius):
         """
         Set the pick radius used for containment tests.
@@ -428,6 +427,9 @@ def set_pickradius(self, pickradius):
         pickradius : float
             Pick radius, in points.
         """
+        if not isinstance(pickradius, Number):
+            raise ValueError(
+                f"pickradius must be a number, not {pickradius!r}")
         self._pickradius = pickradius
 
     def get_pickradius(self):
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -391,7 +391,7 @@ def __init__(self, xdata, ydata,
         # update kwargs before updating data to give the caller a
         # chance to init axes (and hence unit support)
         self._internal_update(kwargs)
-        self._pickradius = pickradius
+        self.pickradius = pickradius
         self.ind_offset = 0
         if (isinstance(self._picker, Number) and
                 not isinstance(self._picker, bool)):
@@ -489,7 +489,6 @@ def get_pickradius(self):
         """
         return self._pickradius
 
-    @_api.rename_parameter("3.6", "d", "pickradius")
     def set_pickradius(self, pickradius):
         """
         Set the pick radius used for containment tests.
