Recreated deprecated files and changed references

oscargus · oscargus · commit 2d8bd625813e · 2022-01-08T12:19:03.000+01:00
diff --git a/doc/api/next_api_changes/deprecations/22134-OG.rst b/doc/api/next_api_changes/deprecations/22134-OG.rst
@@ -0,0 +1,5 @@
+Modules ``tight_bbox`` and ``tight_layout`` deprecated
+------------------------------------------------------
+
+The modules ``matplotlib.tight_bbox`` and ``matplotlib.tight_layout`` are
+considered internal and public access is deprecated.
diff --git a/doc/api/prev_api_changes/api_changes_1.4.x.rst b/doc/api/prev_api_changes/api_changes_1.4.x.rst
@@ -149,9 +149,9 @@ original location:
   ``drawRect`` from ``FigureCanvasQTAgg``; they were always an
   implementation detail of the (preserved) ``drawRectangle()`` function.
 
-* The function signatures of `.tight_bbox.adjust_bbox` and
-  `.tight_bbox.process_figure_for_rasterizing` have been changed. A new
-  *fixed_dpi* parameter allows for overriding the ``figure.dpi`` setting
+* The function signatures of ``matplotlib.tight_bbox.adjust_bbox`` and
+  ``matplotlib.tight_bbox.process_figure_for_rasterizing`` have been changed.
+  A new *fixed_dpi* parameter allows for overriding the ``figure.dpi`` setting
   instead of trying to deduce the intended behaviour from the file format.
 
 * Added support for horizontal/vertical axes padding to
diff --git a/doc/api/prev_api_changes/api_changes_2.2.0.rst b/doc/api/prev_api_changes/api_changes_2.2.0.rst
@@ -159,7 +159,7 @@ If `.MovieWriterRegistry` can't find the requested `.MovieWriter`, a
 more helpful `RuntimeError` message is now raised instead of the
 previously raised `KeyError`.
 
-`~.tight_layout.auto_adjust_subplotpars` now raises `ValueError`
+``matplotlib.tight_layout.auto_adjust_subplotpars`` now raises `ValueError`
 instead of `RuntimeError` when sizes of input lists don't match
 
 
diff --git a/doc/api/prev_api_changes/api_changes_3.0.1.rst b/doc/api/prev_api_changes/api_changes_3.0.1.rst
@@ -1,10 +1,10 @@
 API Changes for 3.0.1
 =====================
 
-`.tight_layout.auto_adjust_subplotpars` can return ``None`` now if the new
-subplotparams will collapse axes to zero width or height.  This prevents
-``tight_layout`` from being executed.  Similarly
-`.tight_layout.get_tight_layout_figure` will return None.
+``matplotlib.tight_layout.auto_adjust_subplotpars`` can return ``None`` now if
+the new subplotparams will collapse axes to zero width or height.
+This prevents ``tight_layout`` from being executed.  Similarly
+``matplotlib.tight_layout.get_tight_layout_figure`` will return None.
 
 To improve import (startup) time, private modules are now imported lazily.
 These modules are no longer available at these locations:
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -44,7 +44,7 @@
 import matplotlib as mpl
 from matplotlib import (
     _api, backend_tools as tools, cbook, colors, docstring, textpath,
-    tight_bbox, transforms, widgets, get_backend, is_interactive, rcParams)
+    _tight_bbox, transforms, widgets, get_backend, is_interactive, rcParams)
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_managers import ToolManager
 from matplotlib.cbook import _setattr_cm
@@ -2248,7 +2248,7 @@ def print_figure(
                     bbox_inches = bbox_inches.padded(pad_inches)
 
                 # call adjust_bbox to save only the given area
-                restore_bbox = tight_bbox.adjust_bbox(
+                restore_bbox = _tight_bbox.adjust_bbox(
                     self.figure, bbox_inches, self.figure.canvas.fixed_dpi)
 
                 _bbox_inches_restore = (bbox_inches, restore_bbox)
diff --git a/lib/matplotlib/backends/backend_mixed.py b/lib/matplotlib/backends/backend_mixed.py
@@ -2,7 +2,7 @@
 
 from matplotlib import cbook
 from matplotlib.backends.backend_agg import RendererAgg
-from matplotlib.tight_bbox import process_figure_for_rasterizing
+from matplotlib._tight_bbox import process_figure_for_rasterizing
 
 
 class MixedModeRenderer:
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -282,7 +282,7 @@ def _get_nth_label_width(self, nth):
                       figure=fig,
                       size=self.labelFontSizeList[nth],
                       fontproperties=self.labelFontProps)
-            .get_window_extent(mpl.tight_layout.get_renderer(fig)).width)
+            .get_window_extent(mpl._tight_layout.get_renderer(fig)).width)
 
     @_api.deprecated("3.5")
     def get_label_width(self, lev, fmt, fsize):
@@ -292,7 +292,7 @@ def get_label_width(self, lev, fmt, fsize):
         fig = self.axes.figure
         width = (text.Text(0, 0, lev, figure=fig,
                            size=fsize, fontproperties=self.labelFontProps)
-                 .get_window_extent(mpl.tight_layout.get_renderer(fig)).width)
+                 .get_window_extent(mpl._tight_layout.get_renderer(fig)).width)
         width *= 72 / fig.dpi
         return width
 
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -3181,7 +3181,7 @@ def tight_layout(self, *, pad=1.08, h_pad=None, w_pad=None, rect=None):
         .pyplot.tight_layout
         """
         from contextlib import nullcontext
-        from .tight_layout import (
+        from ._tight_layout import (
             get_subplotspec_list, get_tight_layout_figure)
         subplotspec_list = get_subplotspec_list(self.axes)
         if None in subplotspec_list:
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -18,7 +18,7 @@
 import numpy as np
 
 import matplotlib as mpl
-from matplotlib import _api, _pylab_helpers, tight_layout, rcParams
+from matplotlib import _api, _pylab_helpers, _tight_layout, rcParams
 from matplotlib.transforms import Bbox
 
 _log = logging.getLogger(__name__)
@@ -466,17 +466,17 @@ def tight_layout(self, figure, renderer=None,
             fit into.
         """
 
-        subplotspec_list = tight_layout.get_subplotspec_list(
+        subplotspec_list = _tight_layout.get_subplotspec_list(
             figure.axes, grid_spec=self)
         if None in subplotspec_list:
             _api.warn_external("This figure includes Axes that are not "
                                "compatible with tight_layout, so results "
                                "might be incorrect.")
 
         if renderer is None:
-            renderer = tight_layout.get_renderer(figure)
+            renderer = _tight_layout.get_renderer(figure)
 
-        kwargs = tight_layout.get_tight_layout_figure(
+        kwargs = _tight_layout.get_tight_layout_figure(
             figure, figure.axes, subplotspec_list, renderer,
             pad=pad, h_pad=h_pad, w_pad=w_pad, rect=rect)
         if kwargs:
diff --git a/lib/matplotlib/tight_bbox.py b/lib/matplotlib/tight_bbox.py
@@ -0,0 +1,5 @@
+from matplotlib._tight_bbox import *  # noqa: F401, F403
+from matplotlib import _api
+_api.warn_deprecated(
+    "3.6", message="The module %(name)s is deprecated since %(since)s.",
+    name=f"{__name__}")
diff --git a/lib/matplotlib/tight_layout.py b/lib/matplotlib/tight_layout.py
@@ -0,0 +1,5 @@
+from matplotlib._tight_layout import *  # noqa: F401, F403
+from matplotlib import _api
+_api.warn_deprecated(
+    "3.6", message="The module %(name)s is deprecated since %(since)s.",
+    name=f"{__name__}")
