Merge pull request #15969 from anntzer/restart-pgf

jklymak · web-flow · commit 3c67db3b60c3 · 2019-12-19T09:09:56.000-08:00
Restart pgf's latex instance after bad latex inputs.
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -232,6 +232,8 @@ def _cleanup_remaining_instances():
             latex_manager._cleanup()
 
     def _stdin_writeln(self, s):
+        if self.latex is None:
+            self._setup_latex_process()
         self.latex.stdin.write(s)
         self.latex.stdin.write("\n")
         self.latex.stdin.flush()
@@ -245,6 +247,8 @@ def _expect(self, s):
             if chars[-len(s):] == s:
                 break
             if not c:
+                self.latex.kill()
+                self.latex = None
                 raise LatexError("LaTeX process halted", "".join(chars))
         return "".join(chars)
 
@@ -281,6 +285,10 @@ def __init__(self):
             raise LatexError("LaTeX returned an error, probably missing font "
                              "or error in preamble:\n%s" % stdout)
 
+        self.latex = None  # Will be set up on first use.
+        self.str_cache = {}  # cache for strings already processed
+
+    def _setup_latex_process(self):
         # open LaTeX process for real work
         self.latex = subprocess.Popen(
             [self.texcommand, "-halt-on-error"],
@@ -292,9 +300,6 @@ def __init__(self):
         self._expect("*pgf_backend_query_start")
         self._expect_prompt()
 
-        # cache for strings already processed
-        self.str_cache = {}
-
     @cbook.deprecated("3.3")
     def latex_stdin_utf8(self):
         return self.latex.stdin
@@ -408,10 +413,10 @@ def __init__(self, figure, fh, dummy=False):
         else:
             # if fh does not belong to a filename, deactivate draw_image
             if not hasattr(fh, 'name') or not os.path.exists(fh.name):
-                cbook._warn_external("streamed pgf-code does not support "
-                                     "raster graphics, consider using the "
-                                     "pgf-to-pdf option", UserWarning)
-                self.__dict__["draw_image"] = lambda *args, **kwargs: None
+                self.__dict__["draw_image"] = \
+                    lambda *args, **kwargs: cbook._warn_external(
+                        "streamed pgf-code does not support raster graphics, "
+                        "consider using the pgf-to-pdf option")
 
     @cbook.deprecated("3.2")
     def latexManager(self):
diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
@@ -1,3 +1,4 @@
+from io import BytesIO
 import os
 from pathlib import Path
 import shutil
@@ -276,3 +277,15 @@ def test_pdf_pages_lualatex():
         pdf.savefig(fig)
 
         assert pdf.get_pagecount() == 2
+
+
+@needs_xelatex
+def test_tex_restart_after_error():
+    fig = plt.figure()
+    fig.suptitle(r"\oops")
+    with pytest.raises(ValueError):
+        fig.savefig(BytesIO(), format="pgf")
+
+    fig = plt.figure()  # start from scratch
+    fig.suptitle(r"this is ok")
+    fig.savefig(BytesIO(), format="pgf")
