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

if an exception occurs.
Will backport to 2.5.

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):
 

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.