summaryrefslogtreecommitdiff
path: root/Lib/lib-tk/tkSimpleDialog.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2006-11-18 18:05:57 +0000
committerMartin v. Löwis <martin@v.loewis.de>2006-11-18 18:05:57 +0000
commite350c840b389f645b25f00f1fa35f6ea1fec03b3 (patch)
tree63dbfc8e4e619f68aa7c302f144bfb2e17071c76 /Lib/lib-tk/tkSimpleDialog.py
parentce9212f018fbd074aba7a37cef4291ebd2e428d4 (diff)
downloadcpython-git-e350c840b389f645b25f00f1fa35f6ea1fec03b3.tar.gz
Patch #1594554: Always close a tkSimpleDialog on ok(), even
if an exception occurs.
Diffstat (limited to 'Lib/lib-tk/tkSimpleDialog.py')
-rw-r--r--Lib/lib-tk/tkSimpleDialog.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/lib-tk/tkSimpleDialog.py b/Lib/lib-tk/tkSimpleDialog.py
index 02ea034b33..445048440a 100644
--- a/Lib/lib-tk/tkSimpleDialog.py
+++ b/Lib/lib-tk/tkSimpleDialog.py
@@ -129,9 +129,10 @@ class Dialog(Toplevel):
self.withdraw()
self.update_idletasks()
- self.apply()
-
- self.cancel()
+ try:
+ self.apply()
+ finally:
+ self.cancel()
def cancel(self, event=None):