Re-add a deprecated cbook.deprecation module for backward compatibility

timhoffm · timhoffm · commit 20c92aedba3f · 2020-10-05T22:24:38.000+02:00
diff --git a/doc/api/next_api_changes/deprecations/18657-TH.rst b/doc/api/next_api_changes/deprecations/18657-TH.rst
@@ -0,0 +1,3 @@
+``matplotlib.cbook.deprecation`` is deprecated
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The module is considered internal and will be removed from the public API.
diff --git a/lib/matplotlib/_api/deprecation.py b/lib/matplotlib/_api/deprecation.py
@@ -17,10 +17,6 @@ class MatplotlibDeprecationWarning(UserWarning):
     """
 
 
-# mplDeprecation is deprecated. Use MatplotlibDeprecationWarning instead.
-mplDeprecation = MatplotlibDeprecationWarning
-
-
 def _generate_deprecation_warning(
         since, message='', name='', alternative='', pending=False, obj_type='',
         addendum='', *, removal=''):
@@ -105,7 +101,7 @@ def warn_deprecated(
     warning = _generate_deprecation_warning(
         since, message, name, alternative, pending, obj_type, addendum,
         removal=removal)
-    from . import _warn_external
+    from ..cbook import _warn_external
     _warn_external(warning, category=MatplotlibDeprecationWarning)
 
 
diff --git a/lib/matplotlib/cbook/deprecation.py b/lib/matplotlib/cbook/deprecation.py
@@ -0,0 +1,10 @@
+# imports are for backward compatibility
+from matplotlib._api.deprecation import (
+    MatplotlibDeprecationWarning, warn_deprecated, deprecated)
+
+# mplDeprecation is deprecated. Use MatplotlibDeprecationWarning instead.
+mplDeprecation = MatplotlibDeprecationWarning
+
+warn_deprecated("3.4",
+                "The module matplotlib.cbook.deprecation is considered "
+                "internal and it will be made private in the future.")

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+``matplotlib.cbook.deprecation`` is deprecated
	`2`	`+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
	`3`	`+The module is considered internal and will be removed from the public API.`