Commitcf7618c

committed

Merge pull request#1098 from efiring/suppress_closing_exception

suppress exception upon quitting with qt4agg on osx

2 parents9aab0be +9520d9f commitcf7618cCopy full SHA for cf7618c

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1599,11 +1599,13 @@ def close_event(self, guiEvent=None):`
`1599`	`1599`	`try:`
`1600`	`1600`	`event=CloseEvent(s,self,guiEvent=guiEvent)`
`1601`	`1601`	`self.callbacks.process(s,event)`
`1602`		`-exceptTypeError:`
	`1602`	`+except(TypeError,AttributeError):`
`1603`	`1603`	`pass`
`1604`	`1604`	`# Suppress the TypeError when the python session is being killed.`
`1605`	`1605`	`# It may be that a better solution would be a mechanism to`
`1606`	`1606`	`# disconnect all callbacks upon shutdown.`
	`1607`	`+# AttributeError occurs on OSX with qt4agg upon exiting`
	`1608`	`+# with an open window; 'callbacks' attribute no longer exists.`
`1607`	`1609`
`1608`	`1610`	`defkey_press_event(self,key,guiEvent=None):`
`1609`	`1611`	`"""`
`@@ -2423,12 +2425,12 @@ def __init__(self, canvas, num):`
`2423`	`2425`	`self.key_press)`
`2424`	`2426`	`"""`
`2425`	`2427`	The returned id from connecting the default key handler via :meth:`FigureCanvasBase.mpl_connnect`.
`2426`		`-`
	`2428`	`+`
`2427`	`2429`	`To disable default key press handling::`
`2428`		`-`
	`2430`	`+`
`2429`	`2431`	`manager, canvas = figure.canvas.manager, figure.canvas`
`2430`	`2432`	`canvas.mpl_disconnect(manager.key_press_handler_id)`
`2431`		`-`
	`2433`	`+`
`2432`	`2434`	`"""`
`2433`	`2435`
`2434`	`2436`	`defdestroy(self):`

Comments

(0)