fixed agg backend switch bug on svg failure

jdh2358 · jdh2358 · commit b3c85d02cd9b · 2007-05-15T21:26:43.000Z
svn path=/trunk/matplotlib/; revision=3272
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -455,6 +455,7 @@ def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
         # render the printed figure
         self.draw()
 
+        printfunc = None
         if not is_string_like(filename):
             # assume png and write to fileobject
             self.renderer._renderer.write_png(filename)
@@ -479,23 +480,33 @@ def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
             elif ext.find('svg')>=0:
                 from backend_svg import FigureCanvasSVG
                 svg = self.switch_backends(FigureCanvasSVG)
-                svg.print_figure(filename, dpi, facecolor, edgecolor,
-                                 orientation, **kwargs)
+                printfunc = svg.print_figure
             elif ext.find('ps')>=0 or ext.find('ep')>=0:
                 from backend_ps import FigureCanvasPS # lazy import
                 ps = self.switch_backends(FigureCanvasPS)
-                ps.print_figure(filename, dpi, facecolor, edgecolor,
-                                orientation, **kwargs)
+                printfunc = ps.print_figure
             elif ext.find('pdf')>=0:
                 from backend_pdf import FigureCanvasPdf
                 pdf = self.switch_backends(FigureCanvasPdf)
-                pdf.print_figure(filename, dpi, facecolor, edgecolor,
-                                  orientation, **kwargs)
+                printfunc = pdf.print_figure
             else:
                 raise IOError('Do not know know to handle extension *%s' % ext)
 
+        if printfunc is not None:
+            try:
+                printfunc(filename, dpi, facecolor, edgecolor, orientation, **kwargs)
+            except:
+                # restore the original figure properties
+                self.figure.dpi.set(origDPI)
+                self.figure.set_facecolor(origfacecolor)
+                self.figure.set_edgecolor(origedgecolor)
+                self.figure.set_canvas(self)            
+                raise
+
         # restore the original figure properties
         self.figure.dpi.set(origDPI)
         self.figure.set_facecolor(origfacecolor)
         self.figure.set_edgecolor(origedgecolor)
         self.figure.set_canvas(self)
+            
+            
diff --git a/lib/matplotlib/backends/backend_gtkagg.py b/lib/matplotlib/backends/backend_gtkagg.py
@@ -116,7 +116,6 @@ def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                 error_msg_gtk('Failed to save\nError message: %s'%(msg,), self)
             except:
                 self.figure.set_canvas(self)
-                raise
 
         self.figure.set_canvas(self)
         if DEBUG: print 'FigureCanvasGTKAgg.print_figure done'
