Patch #1121234: Properly cleanup _exit and tkerror commands.

Will backport to 2.4.

diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index fa57e2587cc705f1e1db74bc6c0144e4a0710ecd..81bf465de1d1437adc962430ebc2715b0722e875 100644 (file)
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -1599,8 +1599,15 @@ class Tk(Misc, Wm):
             raise RuntimeError, \
             "Tk 4.0 or higher is required; found Tk %s" \
             % str(TkVersion)
+        # Create and register the tkerror and exit commands
+        # We need to inline parts of _register here, _ register
+        # would register differently-named commands.
+        if self._tclCommands is None:
+            self._tclCommands = []
         self.tk.createcommand('tkerror', _tkerror)
         self.tk.createcommand('exit', _exit)
+        self._tclCommands.append('tkerror')
+        self._tclCommands.append('exit')
         if _support_default_root and not _default_root:
             _default_root = self
         self.protocol("WM_DELETE_WINDOW", self.destroy)

diff --git a/Misc/NEWS b/Misc/NEWS
index 4add264fb9c3563a89435d84d43b7d071b1048ae..42ef277c3d37f9119f374ec5463dd64cfccd2864 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -59,6 +59,8 @@ Extension Modules
 Library
 -------
 
+- Patch #1121234: Properly cleanup _exit and tkerror commands.
+
 - Patch #1049151: xdrlib now unpacks booleans as True or False.
 
 - Fixed bug in a NameError bug in cookielib.  Patch #1116583.