Merge pull request #16989 from meeseeksmachine/auto-backport-of-pr-16980-on-v3.2.x

QuLogic · web-flow · commit 8ac76de8e8ca · 2020-03-31T20:45:24.000-04:00
Backport PR #16980 on branch v3.2.x (Correctly disable more drawing methods in tight_bboxing renderer.)
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1521,7 +1521,7 @@ def _get_renderer(figure, print_method, *, draw_disabled=False):
     Get the renderer that would be used to save a `~.Figure`, and cache it on
     the figure.
 
-    If *draw_disabled* is True, additionally replace draw_foo methods on
+    If *draw_disabled* is True, additionally replace drawing methods on
     *renderer* by no-ops.  This is used by the tight-bbox-saving renderer,
     which needs to walk through the artist tree to compute the tight-bbox, but
     for which the output file may be closed early.
@@ -1542,7 +1542,8 @@ def _draw(renderer): raise Done(renderer)
 
     if draw_disabled:
         for meth_name in dir(RendererBase):
-            if meth_name.startswith("draw_"):
+            if (meth_name.startswith("draw_")
+                    or meth_name in ["open_group", "close_group"]):
                 setattr(renderer, meth_name, lambda *args, **kwargs: None)
 
     return renderer
diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py
@@ -205,3 +205,9 @@ def include(gid, obj):
     for gid, obj in gdic.items():
         if include(gid, obj):
             assert gid in buf
+
+
+def test_savefig_tight():
+    # Check that the draw-disabled renderer correctly disables open/close_group
+    # as well.
+    plt.savefig(BytesIO(), format="svgz", bbox_inches="tight")
