[Python-checkins] cpython (merge 3.4 -> 3.5): Merge with 3.4

Mon Jul 20 23:46:15 CEST 2015

https://hg.python.org/cpython/rev/28efabbc1d82
changeset: 96968:28efabbc1d82
branch: 3.5
parent: 96964:311a4d28631b
parent: 96967:0220328f962c
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Mon Jul 20 17:45:22 2015 -0400
summary:
 Merge with 3.4
files:
 Lib/idlelib/PathBrowser.py | 10 +++--
 Lib/idlelib/idle_test/test_pathbrowser.py | 17 ++++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Lib/idlelib/PathBrowser.py b/Lib/idlelib/PathBrowser.py
--- a/Lib/idlelib/PathBrowser.py
+++ b/Lib/idlelib/PathBrowser.py
@@ -17,6 +17,7 @@
 self.init(flist)
 
 def settitle(self):
+ "Set window titles."
 self.top.wm_title("Path Browser")
 self.top.wm_iconname("Path Browser")
 
@@ -69,16 +70,17 @@
 return sublist
 
 def ispackagedir(self, file):
+ " Return true for directories that are packages."
 if not os.path.isdir(file):
- return 0
+ return False
 init = os.path.join(file, "__init__.py")
 return os.path.exists(init)
 
 def listmodules(self, allnames):
 modules = {}
 suffixes = importlib.machinery.EXTENSION_SUFFIXES[:]
- suffixes += importlib.machinery.SOURCE_SUFFIXES[:]
- suffixes += importlib.machinery.BYTECODE_SUFFIXES[:]
+ suffixes += importlib.machinery.SOURCE_SUFFIXES
+ suffixes += importlib.machinery.BYTECODE_SUFFIXES
 sorted = []
 for suff in suffixes:
 i = -len(suff)
@@ -93,7 +95,7 @@
 sorted.sort()
 return sorted
 
-def _path_browser(parent):
+def _path_browser(parent): # htest #
 flist = PyShellFileList(parent)
 PathBrowser(flist, _htest=True)
 parent.mainloop()
diff --git a/Lib/idlelib/idle_test/test_pathbrowser.py b/Lib/idlelib/idle_test/test_pathbrowser.py
--- a/Lib/idlelib/idle_test/test_pathbrowser.py
+++ b/Lib/idlelib/idle_test/test_pathbrowser.py
@@ -1,5 +1,8 @@
 import unittest
-import idlelib.PathBrowser as PathBrowser
+import os
+import sys
+import idlelib
+from idlelib import PathBrowser
 
 class PathBrowserTest(unittest.TestCase):
 
@@ -7,6 +10,18 @@
 # Issue16226 - make sure that getting a sublist works
 d = PathBrowser.DirBrowserTreeItem('')
 d.GetSubList()
+ self.assertEqual('', d.GetText())
+
+ dir = os.path.split(os.path.abspath(idlelib.__file__))[0]
+ self.assertEqual(d.ispackagedir(dir), True)
+ self.assertEqual(d.ispackagedir(dir + '/Icons'), False)
+
+ def test_PathBrowserTreeItem(self):
+ 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)
 
 if __name__ == '__main__':
 unittest.main(verbosity=2, exit=False)
-- 
Repository URL: https://hg.python.org/cpython
