[Python-checkins] python/dist/src/Lib pydoc.py,1.86.8.2,1.86.8.3

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8520/Lib

Modified Files:
      Tag: release23-maint
	pydoc.py 
Log Message:
Patch #997284: Allow pydoc to work with XP Themes (.manifest file)


Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.86.8.2
retrieving revision 1.86.8.3
diff -u -d -r1.86.8.2 -r1.86.8.3
--- pydoc.py	19 Jun 2004 01:05:39 -0000	1.86.8.2
+++ pydoc.py	22 Aug 2004 16:14:53 -0000	1.86.8.3
@@ -2056,8 +2056,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