improve error reporting in texmanager

ddale · ddale · commit c5c511e51349 · 2008-07-17T12:01:50.000Z
svn path=/branches/v0_91_maint/; revision=5771
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2008-07-16 Improve error handling in texmanager, thanks to Ian Henry 
+           for reporting - DSD
+
 2008-07-09 Improve mathtext radical rendering - MGD
 
 2008-07-08 Improve mathtext superscript placement - MGD
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -255,16 +255,22 @@ def make_dvi(self, tex, fontsize):
                             %(os.path.split(texfile)[-1], outfile))
             mpl.verbose.report(command, 'debug')
             exit_status = os.system(command)
-            fh = file(outfile)
+            try:
+                fh = file(outfile)
+                report = fh.read()
+                fh.close()
+            except IOError:
+                report = 'No latex error report available.'
             if exit_status:
                 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)) + fh.read())
-            else: mpl.verbose.report(fh.read(), 'debug')
-            fh.close()
+string:\n%s\nHere is the full report generated by LaTeX: \n\n'% repr(tex)) + report)
+            else: mpl.verbose.report(report, 'debug')
             for fname in glob.glob(basefile+'*'):
                 if fname.endswith('dvi'): pass
                 elif fname.endswith('tex'): pass
-                else: os.remove(fname)
+                else:
+                    try: os.remove(fname)
+                    except OSError: pass
 
         return dvifile
 
@@ -282,14 +288,19 @@ def make_png(self, tex, fontsize, dpi):
                         os.path.split(dvifile)[-1], outfile))
             mpl.verbose.report(command, 'debug')
             exit_status = os.system(command)
-            fh = file(outfile)
+            try:
+                fh = file(outfile)
+                report = fh.read()
+                fh.close()
+            except IOError:
+                report = 'No dvipng error report available.'
             if exit_status:
                 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')
-            fh.close()
-            os.remove(outfile)
+\n\n'% dvifile + report)
+            else: mpl.verbose.report(report, 'debug')
+            try: os.remove(outfile)
+            except OSError: pass
 
         return pngfile
 
@@ -363,7 +374,7 @@ def get_grey(self, tex, fontsize=None, dpi=None):
                 # white (1) this reduces to red = 1-alpha or alpha = 1-red
                 #alpha = npy.sqrt(1-X[:,:,0]) # should this be sqrt here?
                 alpha = 1-X[:,:,0]
-                
+
             else:
                 alpha = X[:,:,-1]
 
