Merge pull request #21777 from meeseeksmachine/auto-backport-of-pr-21758-on-v3.5.x

dstansby · web-flow · commit b8ac0d84d7bb · 2021-11-28T15:10:56.000Z
Backport PR #21758 on branch v3.5.x (FIX: Make sure a renderer gets attached to figure after draw)
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
@@ -43,7 +43,7 @@ def _draw(self):
 
     def draw(self):
         # docstring inherited
-        self.draw_idle()
+        self._draw()
         self.flush_events()
 
     # draw_idle is provided by _macosx.FigureCanvas
diff --git a/lib/matplotlib/tests/test_backend_macosx.py b/lib/matplotlib/tests/test_backend_macosx.py
@@ -0,0 +1,20 @@
+import pytest
+
+import matplotlib.pyplot as plt
+
+
+pytest.importorskip("matplotlib.backends.backend_macosx",
+                    reason="These are mac only tests")
+
+
+@pytest.mark.backend('macosx')
+def test_cached_renderer():
+    # Make sure that figures have an associated renderer after
+    # a fig.canvas.draw() call
+    fig = plt.figure(1)
+    fig.canvas.draw()
+    assert fig._cachedRenderer is not None
+
+    fig = plt.figure(2)
+    fig.draw_without_rendering()
+    assert fig._cachedRenderer is not None
