[Python-checkins] python/dist/src/Lib pydoc.py,1.96,1.97

Sun Aug 22 18:13:28 CEST 2004

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7982
Modified Files:
	pydoc.py 
Log Message:
Patch #997284: Allow pydoc to work with XP Themes (.manifest file)
Will backport to 2.3.
Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97

--- pydoc.py	22 Aug 2004 16:08:04 -0000	1.96
+++ pydoc.py	22 Aug 2004 16:13:26 -0000	1.97
@@ -2124,8 +2124,16 @@
 
 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
 
