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

if an exception occurs. Will backport to 2.5.

Patch #1594554: Always close a tkSimpleDialog on ok(), even
if an exception occurs. Will backport to 2.5.
65aaf7c1 · Martin v. Löwis · 6bd3e968 · 65aaf7c1 · 65aaf7c1
Commit 65aaf7c1 authored Nov 18, 2006 by Martin v. Löwis
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

Lib/lib-tk/tkSimpleDialog.py Lib/lib-tk/tkSimpleDialog.py +4 -3

Misc/NEWS Misc/NEWS +3 -0

No files found.
--- 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):


--- 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.