More uses of _deprecate_method_override.

anntzer · anntzer · commit b8eedd850a70 · 2020-04-29T19:59:43.000+02:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -174,13 +174,13 @@ def __init__(self, axes, loc, label=None,
                            ("_get_gridline", "gridline"),
                            ("_get_text1", "label1"),
                            ("_get_text2", "label2")]:
-            if getattr(self, meth) != getattr(Tick, meth).__get__(self):
-                cbook.warn_deprecated(
-                    "3.3", message=f"Relying on {meth} to initialize "
-                    f"Tick.{attr} is deprecated since %(since)s and will not "
-                    f"work %(removal)s; please directly set the attribute in "
-                    "the subclass' __init__ instead.")
-                setattr(self, attr, getattr(self, meth)())
+            overridden_method = cbook._deprecate_method_override(
+                getattr(__class__, meth), self, since="3.3", message="Relying "
+                f"on {meth} to initialize Tick.{attr} is deprecated since "
+                f"%(since)s and will not work %(removal)s; please directly "
+                f"set the attribute in the subclass' __init__ instead.")
+            if overridden_method:
+                setattr(self, attr, overridden_method())
         for artist in [self.tick1line, self.tick2line, self.gridline,
                        self.label1, self.label2]:
             self._set_artist_props(artist)
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -1700,15 +1700,10 @@ def __init__(self, ref_artist, use_blit=False):
 
         if not ref_artist.pickable():
             ref_artist.set_picker(True)
-        with cbook._suppress_matplotlib_deprecation_warning():
-            if self.artist_picker != DraggableBase.artist_picker.__get__(self):
-                overridden_picker = self.artist_picker
-            else:
-                overridden_picker = None
+        overridden_picker = cbook._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:
-            cbook.warn_deprecated(
-                "3.3", name="artist_picker", obj_type="method",
-                addendum="Directly set the artist's picker if desired.")
             ref_artist.set_picker(overridden_picker)
         self.cids = [c2, c3]
 
