Move module cbook.deprecation to _api.deprecation

timhoffm · timhoffm · commit 9330e5c7763a · 2020-10-19T10:52:46.000+02:00
diff --git a/lib/matplotlib/_api/deprecation.py b/lib/matplotlib/_api/deprecation.py
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -29,7 +29,7 @@
 
 import matplotlib
 from matplotlib import _c_internal_utils
-from .deprecation import (
+from matplotlib._api.deprecation import (
     deprecated, warn_deprecated,
     _rename_parameter, _delete_parameter, _make_keyword_only,
     _deprecate_method_override, _deprecate_privatize_attribute,
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -35,6 +35,7 @@
 import matplotlib
 import matplotlib.colorbar
 import matplotlib.image
+from matplotlib import _api
 from matplotlib import rcsetup, style
 from matplotlib import _pylab_helpers, interactive
 from matplotlib import cbook
@@ -2986,7 +2987,7 @@ def quiverkey(Q, X, Y, U, label, **kw):
 def scatter(
         x, y, s=None, c=None, marker=None, cmap=None, norm=None,
         vmin=None, vmax=None, alpha=None, linewidths=None,
-        verts=cbook.deprecation._deprecated_parameter,
+        verts=_api.deprecation._deprecated_parameter,
         edgecolors=None, *, plotnonfinite=False, data=None, **kwargs):
     __ret = gca().scatter(
         x, y, s=s, c=c, marker=marker, cmap=cmap, norm=norm,
diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py
@@ -11,6 +11,7 @@
                            assert_array_almost_equal)
 import pytest
 
+from matplotlib import _api
 import matplotlib.cbook as cbook
 import matplotlib.colors as mcolors
 from matplotlib.cbook import MatplotlibDeprecationWarning, delete_masked_points
@@ -618,7 +619,7 @@ def func2(**kwargs):
         with pytest.warns(MatplotlibDeprecationWarning):
             func(foo="bar")
 
-    def pyplot_wrapper(foo=cbook.deprecation._deprecated_parameter):
+    def pyplot_wrapper(foo=_api.deprecation._deprecated_parameter):
         func1(foo)
 
     pyplot_wrapper()  # No warning.
diff --git a/tools/boilerplate.py b/tools/boilerplate.py
@@ -22,7 +22,7 @@
 
 # This line imports the installed copy of matplotlib, and not the local copy.
 import numpy as np
-from matplotlib import cbook, mlab
+from matplotlib import _api, mlab
 from matplotlib.axes import Axes
 from matplotlib.figure import Figure
 
@@ -74,8 +74,8 @@ def __init__(self, value):
             self._repr = "mlab.window_hanning"
         elif value is np.mean:
             self._repr = "np.mean"
-        elif value is cbook.deprecation._deprecated_parameter:
-            self._repr = "cbook.deprecation._deprecated_parameter"
+        elif value is _api.deprecation._deprecated_parameter:
+            self._repr = "_api.deprecation._deprecated_parameter"
         elif isinstance(value, Enum):
             # Enum str is Class.Name whereas their repr is <Class.Name: value>.
             self._repr = str(value)
