backend_ps: Print strings explicitely when printing error report

tomspur · tomspur · commit bc00092ddcfe · 2017-04-03T23:54:27.000+02:00
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1471,9 +1471,10 @@ def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
                                   stdout=fout, stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as exc:
         with io.open(outfile, 'rb') as fh:
-            raise RuntimeError('LaTeX was not able to process your file: '
-                               'Here is the full report generated by LaTeX'
-                               '\n\n%s'% (fh.read()))
+            raise RuntimeError('LaTeX was not able to process the following '
+                               'file:\n%s\n'
+                               'Here is the full report generated by LaTeX:'
+                               '%s\n\n' % (latexfile, fh.read()))
     else:
         with io.open(outfile, 'rb') as fh:
             verbose.report(fh.read(), 'debug')
@@ -1485,12 +1486,12 @@ def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
     try:
         with open(outfile, "w") as fout:
             subprocess.check_call(command, cwd=tmpdir,
-                                    stdout=fout, stderr=subprocess.STDOUT)
+                                  stdout=fout, stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as exc:
         with io.open(outfile, 'rb') as fh:
             raise RuntimeError('dvips was not able to process the following '
                                'file:\n%s\nHere is the full report generated '
-                               'by dvips: \n\n'% dvifile + fh.read())
+                               'by dvips: %s \n\n' % (dvifile, fh.read()))
     else:
         with io.open(outfile, 'rb') as fh:
             verbose.report(fh.read(), 'debug')
