Patch #1594554: Always close a tkSimpleDialog on ok(), even

if an exception occurs.
Will backport to 2.5.

diff --git a/Lib/lib-tk/tkSimpleDialog.py b/Lib/lib-tk/tkSimpleDialog.py
index 02ea034b339290f1ddd84bc84124fa9bd659d0f7..445048440a9ed936bb741df6c4aff441628a82a7 100644 (file)
--- 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):
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 42f0b93b7fa58b30d1b0286df3392c3adbab3ee3..b1cf907228a5cf366a042921c513c0b141aedbdf 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -98,6 +98,9 @@ Core and builtins
 Library
 -------
 
+- Patch #1594554: Always close a tkSimpleDialog on ok(), even
+  if an exception occurs.
+
 - Patch #1538878: Don't make tkSimpleDialog dialogs transient if
   the parent window is withdrawn.