RF: always close old figure windows

matthew-brett · matthew-brett · commit cb4bba2b23db · 2014-12-12T14:24:35.000-05:00
The plot directive first runs the specified code, then collects figures with:: fig_managers = _pylab_helpers.Gcf.get_all_fig_managers() If you are using the "context" option, prior figures maybe generated from a previous plot directive command, are still open, and therefore collected with the new figure(s). The old figures will usually be earlier in the list, and so, for something like this ReST block, you will always get the first generated figure (``range(10)``) repeated in the second plot directive panel:: ####### A title ####### .. plot:: :context: import matplotlib.pyplot as plt plt.plot(range(10)) Then some text. .. plot:: :context: plt.figure() plt.plot(range(5), 'r') This PR always closes previous figure windows before running the plot directive code. See email discussion thread starting here: https://www.mail-archive.com/matplotlib-devel@lists.sourceforge.net/msg10816.html
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -604,7 +604,9 @@ def render_figures(code, code_path, output_dir, output_base, context,
     for i, code_piece in enumerate(code_pieces):
 
         if not context or config.plot_apply_rcparams:
-            clear_state(config.plot_rcparams, close=not context)
+            clear_state(config.plot_rcparams)
+        else: # Always clear previous figures before running code
+            plt.close('all')
 
         run_code(code_piece, code_path, ns, function_name)
 
