mirror of https://github.com/python/cpython
Patch #1594554: Always close a tkSimpleDialog on ok(), even
if an exception occurs. Will backport to 2.5.
This commit is contained in:
parent
c73a4a4f51
commit
ef5fd3e7c9
|
@ -129,9 +129,10 @@ class Dialog(Toplevel):
|
||||||
self.withdraw()
|
self.withdraw()
|
||||||
self.update_idletasks()
|
self.update_idletasks()
|
||||||
|
|
||||||
self.apply()
|
try:
|
||||||
|
self.apply()
|
||||||
self.cancel()
|
finally:
|
||||||
|
self.cancel()
|
||||||
|
|
||||||
def cancel(self, event=None):
|
def cancel(self, event=None):
|
||||||
|
|
||||||
|
|
|
@ -98,6 +98,9 @@ Core and builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Patch #1594554: Always close a tkSimpleDialog on ok(), even
|
||||||
|
if an exception occurs.
|
||||||
|
|
||||||
- Patch #1538878: Don't make tkSimpleDialog dialogs transient if
|
- Patch #1538878: Don't make tkSimpleDialog dialogs transient if
|
||||||
the parent window is withdrawn.
|
the parent window is withdrawn.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue