py-cvs-rel2_1 (Rev 1.3) merge

"Make the test program work outside IDLE."  -- GvR

diff --git a/Lib/idlelib/ObjectBrowser.py b/Lib/idlelib/ObjectBrowser.py
index 94b59d67f0adaf2f27d007e5f978c83df7886fb0..c235a7564f9a06a0ee31ba05282a39f5dbdf535b 100644 (file)
--- a/Lib/idlelib/ObjectBrowser.py
+++ b/Lib/idlelib/ObjectBrowser.py
@@ -134,18 +134,18 @@ def make_objecttreeitem(labeltext, object, setfunction=None):
 
 # Test script
 
-def test():
+def _test():
     import sys
-    from Tkinter import Toplevel
-    import PyShell
-    root = Toplevel(PyShell.root)
+    from Tkinter import Tk
+    root = Tk()
     root.configure(bd=0, bg="yellow")
     root.focus_set()
     sc = ScrolledCanvas(root, bg="white", highlightthickness=0, takefocus=1)
     sc.frame.pack(expand=1, fill="both")
     item = make_objecttreeitem("sys", sys)
     node = TreeNode(sc.canvas, None, item)
-    node.expand()
+    node.update()
+    root.mainloop()
 
 if __name__ == '__main__':
-    test()
+    _test()