Merge pull request #22423 from anntzer/xpdf

QuLogic · web-flow · commit 11789833037e · 2022-02-07T20:22:46.000-05:00
Avoid indiscriminate glob-remove in xpdf_distill.
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -6,7 +6,6 @@
 import datetime
 from enum import Enum
 import functools
-import glob
 from io import StringIO
 import logging
 import math
@@ -1214,32 +1213,26 @@ def xpdf_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
     mpl._get_executable_info("gs")  # Effectively checks for ps2pdf.
     mpl._get_executable_info("pdftops")
 
-    pdffile = tmpfile + '.pdf'
-    psfile = tmpfile + '.ps'
-
-    # Pass options as `-foo#bar` instead of `-foo=bar` to keep Windows happy
-    # (https://www.ghostscript.com/doc/9.22/Use.htm#MS_Windows).
-    cbook._check_and_log_subprocess(
-        ["ps2pdf",
-         "-dAutoFilterColorImages#false",
-         "-dAutoFilterGrayImages#false",
-         "-sAutoRotatePages#None",
-         "-sGrayImageFilter#FlateEncode",
-         "-sColorImageFilter#FlateEncode",
-         "-dEPSCrop" if eps else "-sPAPERSIZE#%s" % ptype,
-         tmpfile, pdffile], _log)
-    cbook._check_and_log_subprocess(
-        ["pdftops", "-paper", "match", "-level2", pdffile, psfile], _log)
-
-    os.remove(tmpfile)
-    shutil.move(psfile, tmpfile)
-
+    with TemporaryDirectory() as tmpdir:
+        tmppdf = pathlib.Path(tmpdir, "tmp.pdf")
+        tmpps = pathlib.Path(tmpdir, "tmp.ps")
+        # Pass options as `-foo#bar` instead of `-foo=bar` to keep Windows
+        # happy (https://www.ghostscript.com/doc/9.22/Use.htm#MS_Windows).
+        cbook._check_and_log_subprocess(
+            ["ps2pdf",
+             "-dAutoFilterColorImages#false",
+             "-dAutoFilterGrayImages#false",
+             "-sAutoRotatePages#None",
+             "-sGrayImageFilter#FlateEncode",
+             "-sColorImageFilter#FlateEncode",
+             "-dEPSCrop" if eps else "-sPAPERSIZE#%s" % ptype,
+             tmpfile, tmppdf], _log)
+        cbook._check_and_log_subprocess(
+            ["pdftops", "-paper", "match", "-level2", tmppdf, tmpps], _log)
+        shutil.move(tmpps, tmpfile)
     if eps:
         pstoeps(tmpfile)
 
-    for fname in glob.glob(tmpfile+'.*'):
-        os.remove(fname)
-
 
 def get_bbox_header(lbrt, rotated=False):
     """
