From 8c8ec2c3666f18823f7be7377c450e10c1a9620c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 22 Aug 2004 16:14:53 +0000 Subject: [PATCH] Patch #997284: Allow pydoc to work with XP Themes (.manifest file) --- Lib/pydoc.py | 12 ++++++++++-- Misc/NEWS | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 5c5102a3f5ed..6a876f0c580d 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -2056,8 +2056,16 @@ def gui(): import Tkinter try: - gui = GUI(Tkinter.Tk()) - Tkinter.mainloop() + root = Tkinter.Tk() + # Tk will crash if pythonw.exe has an XP .manifest + # file and the root has is not destroyed explicitly. + # If the problem is ever fixed in Tk, the explicit + # destroy can go. + try: + gui = GUI(root) + root.mainloop() + finally: + root.destroy() except KeyboardInterrupt: pass diff --git a/Misc/NEWS b/Misc/NEWS index 1cb3487c1c8a..502baa88c757 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -49,6 +49,8 @@ Extension modules Library ------- +- Patch #997284: Allow pydoc to work with XP Themes (.manifest file) + - Patch #808719: Ignore locale's encoding in IDLE if it is an empty string. - Patch #946153: Add wait_visibility before grab_set. -- 2.47.3