TexManager: Use subprocss instead of os.system

tomspur · tomspur · commit 68a6cc75ebe7 · 2016-12-11T13:14:45.000+01:00
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -43,6 +43,7 @@
 import glob
 import os
 import shutil
+from matplotlib.compat.subprocess import subprocess
 import sys
 import warnings
 
@@ -404,25 +405,36 @@ def make_dvi(self, tex, fontsize):
                 (os.path.split(texfile)[-1], outfile))
             mpl.verbose.report(command, 'debug')
             with Locked(self.texcache):
-                exit_status = os.system(command)
-            try:
-                with open(outfile) as fh:
-                    report = fh.read()
-            except IOError:
-                report = 'No latex error report available.'
-            try:
-                os.stat(dvifile)
-                exists = True
-            except OSError:
-                exists = False
-            if exit_status or not exists:
-                raise RuntimeError(
-                    ('LaTeX was not able to process the following '
-                     'string:\n%s\nHere is the full report generated by '
-                     'LaTeX: \n\n' % repr(tex.encode('unicode_escape')) +
-                     report))
-            else:
-                mpl.verbose.report(report, 'debug')
+                try:
+                    output = subprocess.check_output(command, shell=True,
+                                                     stderr=subprocess.STDOUT)
+                except subprocess.CalledProcessError as exc:
+                    try:
+                        with open(outfile) as fh:
+                            report = fh.read()
+                    except IOError:
+                        report = 'No latex error report available.'
+                    raise RuntimeError(
+                        ('LaTeX was not able to process the following '
+                         'string:\n%s\nLaTeX failed with: %s\n'
+                         'Here is the full report generated by LaTeX: '
+                         '\n\n' % (exc.output,
+                                   repr(tex.encode('unicode_escape'))) +
+                         report))
+                try:
+                    os.stat(dvifile)
+                    exists = True
+                except OSError:
+                    exists = False
+                if not exists:
+                    raise RuntimeError(
+                        ('LaTeX was not able to process the following '
+                         'string:\n%s\n'
+                         'Here is the full report generated by LaTeX: '
+                         '\n\n' % repr(tex.encode('unicode_escape')) +
+                         report))
+                else:
+                    mpl.verbose.report(report, 'debug')
             for fname in glob.glob(basefile + '*'):
                 if fname.endswith('dvi'):
                     pass
@@ -457,20 +469,23 @@ def make_dvi_preview(self, tex, fontsize):
                 'latex -interaction=nonstopmode %s > "%s"' %
                 (os.path.split(texfile)[-1], outfile))
             mpl.verbose.report(command, 'debug')
-            exit_status = os.system(command)
             try:
-                with open(outfile) as fh:
-                    report = fh.read()
-
-            except IOError:
-                report = 'No latex error report available.'
-            if exit_status:
+                output = subprocess.check_output(command, shell=True,
+                                                 stderr=subprocess.STDOUT)
+            except subprocess.CalledProcessError as exc:
+                try:
+                    with open(outfile) as fh:
+                        report = fh.read()
+                except IOError:
+                    report = 'No latex error report available.'
                 raise RuntimeError(
                     ('LaTeX was not able to process the following '
-                     'string:\n%s\nHere is the full report generated by '
-                     'LaTeX: \n\n' % repr(tex)) + report)
-            else:
-                mpl.verbose.report(report, 'debug')
+                     'string:\n%s\nLaTeX failed with: %s\n'
+                     'Here is the full report generated by LaTeX: '
+                     '\n\n' % (exc.output,
+                               repr(tex.encode('unicode_escape'))) +
+                     report))
+            mpl.verbose.report(report, 'debug')
 
             # find the box extent information in the latex output
             # file and store them in ".baseline" file
@@ -512,19 +527,23 @@ def make_png(self, tex, fontsize, dpi):
                 (dpi, os.path.split(pngfile)[-1],
                 os.path.split(dvifile)[-1], outfile))
             mpl.verbose.report(command, 'debug')
-            exit_status = os.system(command)
             try:
-                with open(outfile) as fh:
-                    report = fh.read()
-            except IOError:
-                report = 'No dvipng error report available.'
-            if exit_status:
+                output = subprocess.check_output(command, shell=True,
+                                                 stderr=subprocess.STDOUT)
+            except subprocess.CalledProcessError as exc:
+                try:
+                    with open(outfile) as fh:
+                        report = fh.read()
+                except IOError:
+                    report = 'No dvipng error report available.'
                 raise RuntimeError(
-                    'dvipng was not able to process the following '
-                    'file:\n%s\nHere is the full report generated by '
-                    'dvipng: \n\n' % dvifile + report)
-            else:
-                mpl.verbose.report(report, 'debug')
+                    ('dvipng was not able to process the following '
+                     'string:\n%s\ndvipng failed with: %s\n'
+                     'Here is the full report generated by dvipng: '
+                     '\n\n' % (exc.output,
+                               repr(tex.encode('unicode_escape'))) +
+                     report))
+            mpl.verbose.report(report, 'debug')
             try:
                 os.remove(outfile)
             except OSError:
@@ -550,15 +569,19 @@ def make_ps(self, tex, fontsize):
                 (os.path.split(psfile)[-1],
                  os.path.split(dvifile)[-1], outfile))
             mpl.verbose.report(command, 'debug')
-            exit_status = os.system(command)
-            with open(outfile) as fh:
-                if exit_status:
+            try:
+                output = subprocess.check_output(command, shell=True,
+                                                 stderr=subprocess.STDOUT)
+            except subprocess.CalledProcessError as exc:
+                with open(outfile) as fh:
                     raise RuntimeError(
-                        'dvipng was not able to process the flowing '
-                        'file:\n%s\nHere is the full report generated by '
-                        'dvipng: \n\n' % dvifile + fh.read())
-                else:
-                    mpl.verbose.report(fh.read(), 'debug')
+                        ('dvipng was not able to process the following '
+                         'file:\n%s\ndvipng failed with: %s\n'
+                         'Here is the full report generated by dvipng: '
+                         '\n\n' % (dvifile, exc.output) +
+                         fh.read()))
+            with open(outfile) as fh:
+                mpl.verbose.report(fh.read(), 'debug')
             os.remove(outfile)
 
         return psfile
