Merge pull request #20051 from anntzer/ob33

jklymak · web-flow · commit 766db5170163 · 2021-04-23T09:26:21.000-07:00
Remove offsetbox APIs deprecated in Matplotlib 3.3.
diff --git a/doc/api/next_api_changes/removals/20051-AL.rst b/doc/api/next_api_changes/removals/20051-AL.rst
@@ -0,0 +1,8 @@
+Removal of deprecated ``offsetbox`` APIs
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The following APIs were removed:
+
+- the *s* kwarg to `.AnnotationBbox.get_fontsize` (which had no effect),
+- the ``DraggableBase.artist_picker`` method (set the artist's picker instead),
+- the ``DraggableBase.on_motion_blit`` method (use `.DraggableBase.on_motion`
+  instead).
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -1478,8 +1478,7 @@ def set_fontsize(self, s=None):
         self.prop = FontProperties(size=s)
         self.stale = True
 
-    @_api.delete_parameter("3.3", "s")
-    def get_fontsize(self, s=None):
+    def get_fontsize(self):
         """Return the fontsize in points."""
         return self.prop.get_size_in_points()
 
@@ -1618,22 +1617,15 @@ def finalize_offset(self):
 
     def __init__(self, ref_artist, use_blit=False):
         self.ref_artist = ref_artist
+        if not ref_artist.pickable():
+            ref_artist.set_picker(True)
         self.got_artist = False
-
         self.canvas = self.ref_artist.figure.canvas
         self._use_blit = use_blit and self.canvas.supports_blit
-
-        c2 = self.canvas.mpl_connect('pick_event', self.on_pick)
-        c3 = self.canvas.mpl_connect('button_release_event', self.on_release)
-
-        if not ref_artist.pickable():
-            ref_artist.set_picker(True)
-        overridden_picker = _api.deprecate_method_override(
-            __class__.artist_picker, self, since="3.3",
-            addendum="Directly set the artist's picker if desired.")
-        if overridden_picker is not None:
-            ref_artist.set_picker(overridden_picker)
-        self.cids = [c2, c3]
+        self.cids = [
+            self.canvas.mpl_connect('pick_event', self.on_pick),
+            self.canvas.mpl_connect('button_release_event', self.on_release),
+        ]
 
     def on_motion(self, evt):
         if self._check_still_parented() and self.got_artist:
@@ -1647,16 +1639,6 @@ def on_motion(self, evt):
             else:
                 self.canvas.draw()
 
-    @_api.deprecated("3.3", alternative="self.on_motion")
-    def on_motion_blit(self, evt):
-        if self._check_still_parented() and self.got_artist:
-            dx = evt.x - self.mouse_x
-            dy = evt.y - self.mouse_y
-            self.update_offset(dx, dy)
-            self.canvas.restore_region(self.background)
-            self.ref_artist.draw(self.ref_artist.figure._cachedRenderer)
-            self.canvas.blit()
-
     def on_pick(self, evt):
         if self._check_still_parented() and evt.artist == self.ref_artist:
             self.mouse_x = evt.mouseevent.x
@@ -1700,10 +1682,6 @@ def disconnect(self):
         else:
             self.canvas.mpl_disconnect(c1)
 
-    @_api.deprecated("3.3", alternative="self.ref_artist.contains")
-    def artist_picker(self, artist, evt):
-        return self.ref_artist.contains(evt)
-
     def save_offset(self):
         pass
 
