Switch internal subprocess calls to python stdlib

dstansby · dstansby · commit 7706201f877a · 2018-02-23T18:33:45.000Z
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -10,6 +10,7 @@
 import os
 import re
 import shutil
+import subprocess
 import sys
 import tempfile
 import warnings
@@ -22,8 +23,6 @@
     RendererBase)
 from matplotlib.backends.backend_mixed import MixedModeRenderer
 from matplotlib.cbook import is_writable_file_like
-from matplotlib.compat import subprocess
-from matplotlib.compat.subprocess import check_output
 from matplotlib.path import Path
 
 
@@ -42,13 +41,15 @@
     # assuming fontconfig is installed and the command 'fc-list' exists
     try:
         # list scalable (non-bitmap) fonts
-        fc_list = check_output([str('fc-list'), ':outline,scalable', 'family'])
+        fc_list = subprocess.check_output(
+            [str('fc-list'), ':outline,scalable', 'family'])
         fc_list = fc_list.decode('utf8')
         system_fonts = [f.split(',')[0] for f in fc_list.splitlines()]
         system_fonts = list(set(system_fonts))
     except:
         warnings.warn('error getting fonts from fc-list', UserWarning)
 
+
 def get_texcommand():
     """Get chosen TeX system from rc."""
     texsystem_options = ["xelatex", "lualatex", "pdflatex"]
@@ -173,7 +174,8 @@ def make_pdf_to_png_converter():
     tools_available = []
     # check for pdftocairo
     try:
-        check_output([str("pdftocairo"), "-v"], stderr=subprocess.STDOUT)
+        subprocess.check_output(
+            [str("pdftocairo"), "-v"], stderr=subprocess.STDOUT)
         tools_available.append("pdftocairo")
     except:
         pass
@@ -187,7 +189,7 @@ def make_pdf_to_png_converter():
         def cairo_convert(pdffile, pngfile, dpi):
             cmd = [str("pdftocairo"), "-singlefile", "-png", "-r", "%d" % dpi,
                    pdffile, os.path.splitext(pngfile)[0]]
-            check_output(cmd, stderr=subprocess.STDOUT)
+            subprocess.check_output(cmd, stderr=subprocess.STDOUT)
         return cairo_convert
     elif "gs" in tools_available:
         def gs_convert(pdffile, pngfile, dpi):
@@ -197,7 +199,7 @@ def gs_convert(pdffile, pngfile, dpi):
                    '-dGraphicsAlphaBits=4', '-dDOINTERPOLATE',
                    '-sDEVICE=png16m', '-sOutputFile=%s' % pngfile,
                    '-r%d' % dpi, pdffile]
-            check_output(cmd, stderr=subprocess.STDOUT)
+            subprocess.check_output(cmd, stderr=subprocess.STDOUT)
         return gs_convert
     else:
         raise RuntimeError("No suitable pdf to png renderer found.")
@@ -900,7 +902,8 @@ def _print_pdf_to_fh(self, fh, *args, **kwargs):
             cmdargs = [str(texcommand), "-interaction=nonstopmode",
                        "-halt-on-error", "figure.tex"]
             try:
-                check_output(cmdargs, stderr=subprocess.STDOUT, cwd=tmpdir)
+                subprocess.check_output(
+                    cmdargs, stderr=subprocess.STDOUT, cwd=tmpdir)
             except subprocess.CalledProcessError as e:
                 raise RuntimeError(
                     "%s was not able to process your file.\n\nFull log:\n%s"
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -11,6 +11,7 @@
 import glob, os, shutil, sys, time, datetime
 import io
 import logging
+import subprocess
 
 from tempfile import mkstemp
 from matplotlib import cbook, __version__, rcParams, checkdep_ghostscript
@@ -21,7 +22,6 @@
 
 from matplotlib.cbook import (get_realpath_and_stat, is_writable_file_like,
                               maxdict, file_requires_unicode)
-from matplotlib.compat.subprocess import subprocess
 
 from matplotlib.font_manager import findfont, is_opentype_cff_font, get_font
 from matplotlib.ft2font import KERNING_DEFAULT, LOAD_NO_HINTING
@@ -78,8 +78,8 @@ def gs_version(self):
         except KeyError:
             pass
 
-        from matplotlib.compat.subprocess import Popen, PIPE
-        s = Popen([self.gs_exe, "--version"], stdout=PIPE)
+        s = subprocess.Popen(
+            [self.gs_exe, "--version"], stdout=subprocess.PIPE)
         pipe, stderr = s.communicate()
         if six.PY3:
             ver = pipe.decode('ascii')
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -1295,7 +1295,7 @@ def restrict_dict(d, keys):
 
 def report_memory(i=0):  # argument may go away
     """return the memory consumed by process"""
-    from matplotlib.compat.subprocess import Popen, PIPE
+    from subprocess import Popen, PIPE
     pid = os.getpid()
     if sys.platform == 'sunos5':
         try:
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -568,7 +568,7 @@ def skip_if_command_unavailable(cmd):
         return a non zero exit code, something like
         ["latex", "-version"]
     """
-    from matplotlib.compat.subprocess import check_output
+    from subprocess import check_output
     try:
         check_output(cmd)
     except:
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
@@ -1,20 +1,14 @@
 import importlib
 import os
+import subprocess
 import sys
 
-from matplotlib.compat.subprocess import Popen
 import pytest
 
 
 # Minimal smoke-testing of the backends for which the dependencies are
 # PyPI-installable on Travis.  They are not available for all tested Python
 # versions so we don't fail on missing backends.
-#
-# We also don't test on Py2 because its subprocess module doesn't support
-# timeouts, and it would require a separate code path to check for module
-# existence without actually trying to import the module (which may install
-# an undesirable input hook).
-
 
 def _get_testable_interactive_backends():
     backends = []
@@ -53,6 +47,6 @@ def _get_testable_interactive_backends():
 def test_backend(backend):
     environ = os.environ.copy()
     environ["MPLBACKEND"] = backend
-    proc = Popen([sys.executable, "-c", _test_script], env=environ)
+    proc = subprocess.Popen([sys.executable, "-c", _test_script], env=environ)
     # Empirically, 1s is not enough on Travis.
     assert proc.wait(timeout=10) == 0
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -44,6 +44,7 @@
 import os
 from pathlib import Path
 import shutil
+import subprocess
 import sys
 import warnings
 
@@ -53,7 +54,6 @@
 from matplotlib import rcParams
 from matplotlib._png import read_png
 from matplotlib.cbook import Locked
-from matplotlib.compat.subprocess import subprocess, Popen, PIPE, STDOUT
 import matplotlib.dviread as dviread
 import re
 
