Merge pull request #22732 from jklymak/fix-renderer-dance

tacaswell · web-flow · commit 9e0eb54fd98b · 2022-04-04T18:22:21.000-04:00
FIX: improve cached renderer dance
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
@@ -18,7 +18,7 @@
 import numpy as np
 
 from matplotlib import _api, artist as martist
-from matplotlib.backend_bases import _get_renderer
+from matplotlib._tight_layout import get_renderer
 import matplotlib.transforms as mtransforms
 import matplotlib._layoutgrid as mlayoutgrid
 
@@ -92,7 +92,7 @@ def do_constrained_layout(fig, h_pad, w_pad,
     layoutgrid : private debugging structure
     """
 
-    renderer = _get_renderer(fig)
+    renderer = get_renderer(fig)
     # make layoutgrid tree...
     layoutgrids = make_layoutgrids(fig, None)
     if not layoutgrids['hasgrids']:
diff --git a/lib/matplotlib/layout_engine.py b/lib/matplotlib/layout_engine.py
@@ -22,7 +22,8 @@
 from matplotlib._constrained_layout import do_constrained_layout
 from matplotlib._tight_layout import (get_subplotspec_list,
                                       get_tight_layout_figure)
-from matplotlib.backend_bases import _get_renderer
+# from matplotlib.backend_bases import _get_renderer
+from matplotlib._tight_layout import get_renderer
 
 
 class LayoutEngine:
@@ -153,7 +154,7 @@ def execute(self, fig):
             _api.warn_external("This figure includes Axes that are not "
                                "compatible with tight_layout, so results "
                                "might be incorrect.")
-        renderer = _get_renderer(fig)
+        renderer = get_renderer(fig)
         with getattr(renderer, "_draw_disabled", nullcontext)():
             kwargs = get_tight_layout_figure(
                 fig, fig.axes, subplotspec_list, renderer,
