Merge pull request #10577 from anntzer/pickle

dstansby · web-flow · commit f7757eb7edcc · 2018-02-24T11:04:11.000Z
Minor simplification to Figure.__getstate__ logic.
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1858,14 +1858,11 @@ def __getstate__(self):
         # add version information to the state
         state['__mpl_version__'] = _mpl_version
 
-        # check to see if the figure has a manager and whether it is registered
-        # with pyplot
-        if getattr(self.canvas, 'manager', None) is not None:
-            manager = self.canvas.manager
-            import matplotlib._pylab_helpers
-            if manager in list(six.itervalues(
-                    matplotlib._pylab_helpers.Gcf.figs)):
-                state['_restore_to_pylab'] = True
+        # check whether the figure manager (if any) is registered with pyplot
+        from matplotlib import _pylab_helpers
+        if getattr(self.canvas, 'manager', None) \
+                in _pylab_helpers.Gcf.figs.values():
+            state['_restore_to_pylab'] = True
 
         # set all the layoutbox information to None.  kiwisolver objects can't
         # be pickled, so we lose the layout options at this point.
