Quick fix to figure for safe unpickling.

OceanWolf · OceanWolf · commit 61a709039d7e · 2015-02-26T16:30:07.000+01:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1358,11 +1358,18 @@ def __setstate__(self, state):
 
         if restore_to_pylab:
             # lazy import to avoid circularity
+            # XXX clean on removal of Gcf from backends
             import matplotlib.pyplot as plt
             import matplotlib._pylab_helpers as pylab_helpers
+            import matplotlib.backend_managers as managers
             allnums = plt.get_fignums()
             num = max(allnums) + 1 if allnums else 1
-            mgr = plt._backend_mod.new_figure_manager_given_figure(num, self)
+            if managers.old_new_figure_manager:
+                mgr = plt._backend_mod.new_figure_manager_given_figure(num,
+                                                                       self)
+                mgr.mainloop = plt._show
+            else:
+                mgr = managers.new_figure_manager_given_figure(num, self)
 
             # XXX The following is a copy and paste from pyplot. Consider
             # factoring to pylab_helpers
@@ -1377,7 +1384,7 @@ def make_active(event):
             mgr._cidgcf = mgr.canvas.mpl_connect('button_press_event',
                                                  make_active)
 
-            pylab_helpers.Gcf.set_active(mgr)
+            pylab_helpers.Gcf.add_figure_manager(mgr)
             self.number = num
 
             plt.draw_if_interactive()
