1 files changed, 8 insertions, 66 deletions
diff --git a/Lib/idlelib/idle_test/test_pathbrowser.py b/Lib/idlelib/idle_test/test_pathbrowser.py
index 13d8b9e..f028414 100644
--- a/Lib/idlelib/idle_test/test_pathbrowser.py
+++ b/Lib/idlelib/idle_test/test_pathbrowser.py
@@ -1,69 +1,14 @@
-"Test pathbrowser, coverage 95%."
-
-from idlelib import pathbrowser
 import unittest
-from test.support import requires
-from tkinter import Tk
-
-import os.path
-import pyclbr  # for _modules
-import sys  # for sys.path
-
-from idlelib.idle_test.mock_idle import Func
-import idlelib  # for __file__
-from idlelib import browser
-from idlelib.tree import TreeNode
-
+import os
+import sys
+import idlelib
+from idlelib import PathBrowser
 
 class PathBrowserTest(unittest.TestCase):
 
-    @classmethod
-    def setUpClass(cls):
-        requires('gui')
-        cls.root = Tk()
-        cls.root.withdraw()
-        cls.pb = pathbrowser.PathBrowser(cls.root, _utest=True)
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.pb.close()
-        cls.root.update_idletasks()
-        cls.root.destroy()
-        del cls.root, cls.pb
-
-    def test_init(self):
-        pb = self.pb
-        eq = self.assertEqual
-        eq(pb.master, self.root)
-        eq(pyclbr._modules, {})
-        self.assertIsInstance(pb.node, TreeNode)
-        self.assertIsNotNone(browser.file_open)
-
-    def test_settitle(self):
-        pb = self.pb
-        self.assertEqual(pb.top.title(), 'Path Browser')
-        self.assertEqual(pb.top.iconname(), 'Path Browser')
-
-    def test_rootnode(self):
-        pb = self.pb
-        rn = pb.rootnode()
-        self.assertIsInstance(rn, pathbrowser.PathBrowserTreeItem)
-
-    def test_close(self):
-        pb = self.pb
-        pb.top.destroy = Func()
-        pb.node.destroy = Func()
-        pb.close()
-        self.assertTrue(pb.top.destroy.called)
-        self.assertTrue(pb.node.destroy.called)
-        del pb.top.destroy, pb.node.destroy
-
-
-class DirBrowserTreeItemTest(unittest.TestCase):
-
     def test_DirBrowserTreeItem(self):
         # Issue16226 - make sure that getting a sublist works
-        d = pathbrowser.DirBrowserTreeItem('')
+        d = PathBrowser.DirBrowserTreeItem('')
         d.GetSubList()
         self.assertEqual('', d.GetText())
 
@@ -71,16 +16,13 @@ class DirBrowserTreeItemTest(unittest.TestCase):
         self.assertEqual(d.ispackagedir(dir), True)
         self.assertEqual(d.ispackagedir(dir + '/Icons'), False)
 
-
-class PathBrowserTreeItemTest(unittest.TestCase):
-
     def test_PathBrowserTreeItem(self):
-        p = pathbrowser.PathBrowserTreeItem()
+        p = PathBrowser.PathBrowserTreeItem()
         self.assertEqual(p.GetText(), 'sys.path')
         sub = p.GetSubList()
         self.assertEqual(len(sub), len(sys.path))
-        self.assertEqual(type(sub[0]), pathbrowser.DirBrowserTreeItem)
-
+        # Following fails in 2.7 because old-style class
+        #self.assertEqual(type(sub[0]), PathBrowser.DirBrowserTreeItem)
 
 if __name__ == '__main__':
     unittest.main(verbosity=2, exit=False)