Replaced deprecated os.path.walk usage with os.walk

test/lib/TestCmd.py

 """
 TestCmd.py:  a testing framework for commands and scripts.
 
 The TestCmd module provides a framework for portable automated testing
 of executable commands and scripts (in any language, not just Python),
 especially commands and scripts that require file system interaction.
 
 In addition to running tests and evaluating conditions, the TestCmd
 module manages and cleans up one or more temporary workspace
 directories, and provides methods for creating files and directories in
@@ skipping 293 matching lines @@
 
 try:
     zip
 except NameError:
     def zip(*lists):
         result = []
         for i in xrange(min(map(len, lists))):
             result.append(tuple(map(lambda l, i=i: l[i], lists)))
         return result
 
-class Collector:
-    def __init__(self, top):
-        self.entries = [top]
-    def __call__(self, arg, dirname, names):
-        pathjoin = lambda n, d=dirname: os.path.join(d, n)
-        self.entries.extend(map(pathjoin, names))
-
 def _caller(tblist, skip):
     string = ""
     arr = []
     for file, line, name, text in tblist:
         if file[-10:] == "TestCmd.py":
                 break
         arr = [(file, line, name, text)] + arr
     atfrom = "at"
     for file, line, name, text in arr[skip:]:
         if name in ("?", "<module>"):
@@ skipping 1124 matching lines @@
                 except OSError: pass
                 else: os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]&~stat.S_IREAD))
 
         if os.path.isfile(top):
             # If it's a file, that's easy, just chmod it.
             do_chmod(top)
         elif read:
             # It's a directory and we're trying to turn on read
             # permission, so it's also pretty easy, just chmod the
             # directory and then chmod every entry on our walk down the
-            # tree.  Because os.path.walk() is top-down, we'll enable
+            # tree.  Because os.walk() is top-down, we'll enable
             # read permission on any directories that have it disabled
-            # before os.path.walk() tries to list their contents.
+            # before os.walk() tries to list their contents.
             do_chmod(top)
 
-            def chmod_entries(arg, dirname, names, do_chmod=do_chmod):
-                for n in names:
+            for dirname, dirnames, filenames in os.walk(top):
+                for n in dirnames:
                     do_chmod(os.path.join(dirname, n))
-
-            os.path.walk(top, chmod_entries, None)
+                for n in filenames:
+                    do_chmod(os.path.join(dirname, n))
         else:
             # It's a directory and we're trying to turn off read
             # permission, which means we have to chmod the directoreis
             # in the tree bottom-up, lest disabling read permission from
             # the top down get in the way of being able to get at lower
-            # parts of the tree.  But os.path.walk() visits things top
-            # down, so we just use an object to collect a list of all
-            # of the entries in the tree, reverse the list, and then
-            # chmod the reversed (bottom-up) list.
-            col = Collector(top)
-            os.path.walk(top, col, None)
-            col.entries.reverse()
-            for d in col.entries: do_chmod(d)
+            # parts of the tree.
+            for dirname, dirnames, filenames in os.walk(top, topdown=False):
+                for n in dirnames:
+                    do_chmod(os.path.join(dirname, n))
+                for n in filenames:
+                    do_chmod(os.path.join(dirname, n))
+
+            do_chmod(top)
 
     def writable(self, top, write=1):
         """Make the specified directory tree writable (write == 1)
         or not (write == None).
         """
 
         if sys.platform == 'win32':
 
             if write:
                 def do_chmod(fname):
@@ skipping 13 matching lines @@
                     else: os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]|0200))
             else:
                 def do_chmod(fname):
                     try: st = os.stat(fname)
                     except OSError: pass
                     else: os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]&~0200))
 
         if os.path.isfile(top):
             do_chmod(top)
         else:
-            col = Collector(top)
-            os.path.walk(top, col, None)
-            for d in col.entries: do_chmod(d)
+            do_chmod(top)
+            for dirname, dirnames, filenames in os.walk(top):
+                for n in dirnames:
+                    do_chmod(os.path.join(dirname, n))
+                for n in filenames:
+                    do_chmod(os.path.join(dirname, n))
 
     def executable(self, top, execute=1):
         """Make the specified directory tree executable (execute == 1)
         or not (execute == None).
 
         This method has no effect on Windows systems, which use a
         completely different mechanism to control file executability.
         """
 
         if sys.platform == 'win32':
@@ skipping 10 matching lines @@
                 except OSError: pass
                 else: os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]&~stat.S_IEXEC))
 
         if os.path.isfile(top):
             # If it's a file, that's easy, just chmod it.
             do_chmod(top)
         elif execute:
             # It's a directory and we're trying to turn on execute
             # permission, so it's also pretty easy, just chmod the
             # directory and then chmod every entry on our walk down the
-            # tree.  Because os.path.walk() is top-down, we'll enable
+            # tree.  Because os.walk() is top-down, we'll enable
             # execute permission on any directories that have it disabled
-            # before os.path.walk() tries to list their contents.
+            # before os.walk() tries to list their contents.
             do_chmod(top)
 
-            def chmod_entries(arg, dirname, names, do_chmod=do_chmod):
-                for n in names:
+            for dirname, dirnames, filenames in os.walk(top):
+                for n in dirnames:
                     do_chmod(os.path.join(dirname, n))
-
-            os.path.walk(top, chmod_entries, None)
+                for n in filenames:
+                    do_chmod(os.path.join(dirname, n))
         else:
             # It's a directory and we're trying to turn off execute
             # permission, which means we have to chmod the directories
             # in the tree bottom-up, lest disabling execute permission from
             # the top down get in the way of being able to get at lower
-            # parts of the tree.  But os.path.walk() visits things top
-            # down, so we just use an object to collect a list of all
-            # of the entries in the tree, reverse the list, and then
-            # chmod the reversed (bottom-up) list.
-            col = Collector(top)
-            os.path.walk(top, col, None)
-            col.entries.reverse()
-            for d in col.entries: do_chmod(d)
+            # parts of the tree.
+            for dirname, dirnames, filenames in os.walk(top, topdown=False):
+                for n in dirnames:
+                    do_chmod(os.path.join(dirname, n))
+                for n in filenames:
+                    do_chmod(os.path.join(dirname, n))
+
+            do_chmod(top)
 
     def write(self, file, content, mode = 'wb'):
         """Writes the specified content text (second argument) to the
         specified file name (first argument).  The file name may be
         a list, in which case the elements are concatenated with the
         os.path.join() method.  The file is created under the temporary
         working directory.  Any subdirectories in the path must already
         exist.  The I/O mode for the file may be specified; it must
         begin with a 'w'.  The default is 'wb' (binary write).
         """
         file = self.canonicalize(file)
         if mode[0] != 'w':
             raise ValueError, "mode must begin with 'w'"
         with open(file, mode) as f:
             f.write(content)
 
 # Local Variables:
 # tab-width:4
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=4 shiftwidth=4: