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

timhoffm · web-flow · commit 909197581085 · 2020-01-13T23:34:34.000+01:00
Backport PR #16189 on branch v3.2.x (MNT: set default canvas when un-pickling)
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -2026,7 +2026,7 @@ def __setstate__(self, state):
 
         # re-initialise some of the unstored state information
         self._axobservers = []
-        self.canvas = None
+        FigureCanvasBase(self)  # Set self.canvas.
         self._layoutbox = None
 
         if restore_to_pylab:
diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
@@ -10,6 +10,7 @@
 from matplotlib.dates import rrulewrapper
 import matplotlib.pyplot as plt
 import matplotlib.transforms as mtransforms
+import matplotlib.figure as mfigure
 
 
 def test_simple():
@@ -194,3 +195,13 @@ def test_shared():
 @pytest.mark.parametrize("cmap", cm.cmap_d.values())
 def test_cmap(cmap):
     pickle.dumps(cmap)
+
+
+def test_unpickle_canvas():
+    fig = mfigure.Figure()
+    assert fig.canvas is not None
+    out = BytesIO()
+    pickle.dump(fig, out)
+    out.seek(0)
+    fig2 = pickle.load(out)
+    assert fig2.canvas is not None
