summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/lib-tk/Tkinter.py7
-rw-r--r--Misc/NEWS2
2 files changed, 9 insertions, 0 deletions
diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index fa57e25..81bf465 100644
--- 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 4add264..42ef277 100644
--- 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.