Skip to content

Commit deecd64

Browse files
committed
Make the save_figure methods consistent with the base class signature.
Fix a call to save_figure in backend_bases.py. This bug caused the keypress_demo.py example to fail on all backends except those based on GTK. The bug was reported by David Arnold on the mailing list on February 14, 2010. svn path=/trunk/matplotlib/; revision=8141
1 parent 64fb00a commit deecd64

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

lib/matplotlib/backend_bases.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1923,7 +1923,7 @@ def key_press(self, event):
19231923
self.canvas.toolbar.zoom()
19241924
# saving current figure (default key 's')
19251925
elif event.key in save_keys:
1926-
self.canvas.toolbar.save_figure(self.canvas.toolbar)
1926+
self.canvas.toolbar.save_figure()
19271927

19281928
if event.inaxes is None:
19291929
return

lib/matplotlib/backends/backend_gtk.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ def get_filechooser(self):
653653
filetypes=self.canvas.get_supported_filetypes(),
654654
default_filetype=self.canvas.get_default_filetype())
655655

656-
def save_figure(self, button):
656+
def save_figure(self, *args):
657657
fname, format = self.get_filechooser().get_filename_from_user()
658658
if fname:
659659
try:
@@ -908,7 +908,7 @@ def get_filechooser(self):
908908
filetypes=self.canvas.get_supported_filetypes(),
909909
default_filetype=self.canvas.get_default_filetype())
910910

911-
def save_figure(self, button):
911+
def save_figure(self, *args):
912912
fname, format = self.get_filechooser().get_filename_from_user()
913913
if fname:
914914
try:

lib/matplotlib/backends/backend_macosx.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ def zoomy(self, direction):
392392
axes[i].yaxis.zoom(direction)
393393
self.canvas.invalidate()
394394

395-
def save_figure(self):
395+
def save_figure(self, *args):
396396
filename = _macosx.choose_save_file('Save the figure')
397397
if filename is None: # Cancel
398398
return
@@ -416,7 +416,7 @@ def release(self, event):
416416
def set_cursor(self, cursor):
417417
_macosx.set_cursor(cursor)
418418

419-
def save_figure(self):
419+
def save_figure(self, *args):
420420
filename = _macosx.choose_save_file('Save the figure')
421421
if filename is None: # Cancel
422422
return

lib/matplotlib/backends/backend_qt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ def configure_subplots(self):
422422
def _get_canvas(self, fig):
423423
return FigureCanvasQT(fig)
424424

425-
def save_figure( self ):
425+
def save_figure(self, *args):
426426
filetypes = self.canvas.get_supported_filetypes_grouped()
427427
sorted_filetypes = filetypes.items()
428428
sorted_filetypes.sort()

lib/matplotlib/backends/backend_qt4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ def configure_subplots(self):
431431
def _get_canvas(self, fig):
432432
return FigureCanvasQT(fig)
433433

434-
def save_figure( self ):
434+
def save_figure(self, *args):
435435
filetypes = self.canvas.get_supported_filetypes_grouped()
436436
sorted_filetypes = filetypes.items()
437437
sorted_filetypes.sort()

lib/matplotlib/backends/backend_tkagg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ def zoomy(self, direction):
576576
a.yaxis.zoom(direction)
577577
self.canvas.draw()
578578

579-
def save_figure(self):
579+
def save_figure(self, *args):
580580
fs = FileDialog.SaveFileDialog(master=self.window,
581581
title='Save the figure')
582582
try:
@@ -703,7 +703,7 @@ def configure_subplots(self):
703703
canvas.show()
704704
canvas.get_tk_widget().pack(side=Tk.TOP, fill=Tk.BOTH, expand=1)
705705

706-
def save_figure(self):
706+
def save_figure(self, *args):
707707
from tkFileDialog import asksaveasfilename
708708
from tkMessageBox import showerror
709709
filetypes = self.canvas.get_supported_filetypes().copy()

0 commit comments

Comments
 (0)