Merge remote-tracking branch 'upstream/v1.2.x' into v1.3.x

mdboom · mdboom · commit 0d2f9a7ac18c · 2013-05-28T20:47:54.000-04:00
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -748,7 +748,9 @@ def get_filechooser(self):
         return fc
 
     def save_figure(self, *args):
-        fname, format = self.get_filechooser().get_filename_from_user()
+        chooser = self.get_filechooser()
+        fname, format = chooser.get_filename_from_user()
+        chooser.destroy()
         if fname:
             startpath = os.path.expanduser(rcParams.get('savefig.directory', ''))
             if startpath == '':
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -556,7 +556,9 @@ def get_filechooser(self):
         return fc
 
     def save_figure(self, *args):
-        fname, format = self.get_filechooser().get_filename_from_user()
+        chooser = self.get_filechooser()
+        fname, format = chooser.get_filename_from_user()
+        chooser.destroy()
         if fname:
             startpath = os.path.expanduser(rcParams.get('savefig.directory', ''))
             if startpath == '':
@@ -567,7 +569,7 @@ def save_figure(self, *args):
                 rcParams['savefig.directory'] = os.path.dirname(unicode(fname))
             try:
                 self.canvas.print_figure(fname, format=format)
-            except Exception, e:
+            except Exception as e:
                 error_msg_gtk(str(e), parent=self)
 
     def configure_subplots(self, button):
