Merge pull request #17301 from anntzer/dpa

timhoffm · web-flow · commit 7147844e42b6 · 2020-05-02T13:11:32.000+02:00
Use deprecate_privatize_attribute more.
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -276,15 +276,8 @@ class MovieWriter(AbstractMovieWriter):
     # stored.  Third-party writers cannot meaningfully set these as they cannot
     # extend rcParams with new keys.
 
-    @cbook.deprecated("3.3")
-    @property
-    def exec_key(self):
-        return self._exec_key
-
-    @cbook.deprecated("3.3")
-    @property
-    def args_key(self):
-        return self._args_key
+    exec_key = cbook._deprecate_privatize_attribute("3.3")
+    args_key = cbook._deprecate_privatize_attribute("3.3")
 
     def __init__(self, fps=5, codec=None, bitrate=None, extra_args=None,
                  metadata=None):
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -420,10 +420,7 @@ def __init__(self, figure, fh, dummy=False):
                 if m.startswith("draw_"):
                     self.__dict__[m] = lambda *args, **kwargs: None
 
-    @cbook.deprecated("3.2")
-    @property
-    def latexManager(self):
-        return self._latexManager
+    latexManager = cbook._deprecate_privatize_attribute("3.2")
 
     def draw_markers(self, gc, marker_path, marker_trans, path, trans,
                      rgbFace=None):
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -689,10 +689,8 @@ def __init__(self, canvas, parent, coordinates=True):
 
         NavigationToolbar2.__init__(self, canvas)
 
-    @cbook.deprecated("3.3", alternative="self.canvas.parent()")
-    @property
-    def parent(self):
-        return self._parent
+    parent = cbook._deprecate_privatize_attribute(
+        "3.3", alternative="self.canvas.parent()")
 
     @cbook.deprecated(
         "3.3", alternative="os.path.join(mpl.get_data_path(), 'images')")
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -471,10 +471,7 @@ def changed(self):
             self._update_dict[key] = True
         self.stale = True
 
-    @cbook.deprecated("3.3")
-    @property
-    def update_dict(self):
-        return self._update_dict
+    update_dict = cbook._deprecate_privatize_attribute("3.3")
 
     @cbook.deprecated("3.3")
     def add_checker(self, checker):
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -990,10 +990,7 @@ def _check_unsampled_image(self):
         """Return False. Do not use unsampled image."""
         return False
 
-    @cbook.deprecated("3.3")
-    @property
-    def is_grayscale(self):
-        return self._is_grayscale
+    is_grayscale = cbook._deprecate_privatize_attribute("3.3")
 
     def make_image(self, renderer, magnification=1.0, unsampled=False):
         # docstring inherited
@@ -1144,10 +1141,7 @@ def __init__(self, ax,
         if A is not None:
             self.set_data(x, y, A)
 
-    @cbook.deprecated("3.3")
-    @property
-    def is_grayscale(self):
-        return self._is_grayscale
+    is_grayscale = cbook._deprecate_privatize_attribute("3.3")
 
     def make_image(self, renderer, magnification=1.0, unsampled=False):
         # docstring inherited
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -650,10 +650,7 @@ def __init__(self, patch, ox, oy, props=None, **kwargs):
         self._shadow_transform = transforms.Affine2D()
         self._update()
 
-    @cbook.deprecated("3.3")
-    @property
-    def props(self):
-        return self._props
+    props = cbook._deprecate_privatize_attribute("3.3")
 
     def _update(self):
         self.update_from(self.patch)
diff --git a/lib/mpl_toolkits/axes_grid1/axes_grid.py b/lib/mpl_toolkits/axes_grid1/axes_grid.py
@@ -58,15 +58,10 @@ def colorbar(self, mappable, *, ticks=None, **kwargs):
         self._config_axes()
         return cb
 
-    @cbook.deprecated("3.3", alternative="mappable.colorbar_cid")
-    @property
-    def cbid(self):
-        return self._cbid
-
-    @cbook.deprecated("3.3", alternative=".colorbar().locator")
-    @property
-    def locator(self):
-        return self._locator
+    cbid = cbook._deprecate_privatize_attribute(
+        "3.3", alternative="mappable.colorbar_cid")
+    locator = cbook._deprecate_privatize_attribute(
+        "3.3", alternative=".colorbar().locator")
 
     def _config_axes(self):
         """Make an axes patch and outline."""
