[Python-3000-checkins] r62953 - in python/branches/py3k: Lib/os.py Mac/Tools/Doc/setup.py Mac/scripts/cachersrc.py Mac/scripts/zappycfiles.py Tools/i18n/pygettext.py Tools/scripts/findlinksto.py Tools/versioncheck/checkversions.py setup.py

alexandre.vassalotti python-3000-checkins at python.org
Fri May 9 22:00:17 CEST 2008


Author: alexandre.vassalotti
Date: Fri May  9 22:00:17 2008
New Revision: 62953

Log:
Removed remnants of os.path.walk().



Modified:
   python/branches/py3k/Lib/os.py
   python/branches/py3k/Mac/Tools/Doc/setup.py
   python/branches/py3k/Mac/scripts/cachersrc.py
   python/branches/py3k/Mac/scripts/zappycfiles.py
   python/branches/py3k/Tools/i18n/pygettext.py
   python/branches/py3k/Tools/scripts/findlinksto.py
   python/branches/py3k/Tools/versioncheck/checkversions.py
   python/branches/py3k/setup.py

Modified: python/branches/py3k/Lib/os.py
==============================================================================
--- python/branches/py3k/Lib/os.py	(original)
+++ python/branches/py3k/Lib/os.py	Fri May  9 22:00:17 2008
@@ -264,7 +264,7 @@
     from os.path import join, isdir, islink
 
     # We may not have read permission for top, in which case we can't
-    # get a list of the files the directory contains.  os.path.walk
+    # get a list of the files the directory contains.  os.walk
     # always suppressed the exception then, rather than blow up for a
     # minor reason when (say) a thousand readable directories are still
     # left to visit.  That logic is copied here.

Modified: python/branches/py3k/Mac/Tools/Doc/setup.py
==============================================================================
--- python/branches/py3k/Mac/Tools/Doc/setup.py	(original)
+++ python/branches/py3k/Mac/Tools/Doc/setup.py	Fri May  9 22:00:17 2008
@@ -109,7 +109,7 @@
 
     def hackHtml(self):
         self.r = re.compile('<dl><dd>')
-        os.path.walk(self.build_html, self.visit, None)
+        os.walk(self.build_html, self.visit, None)
 
     def visit(self, dummy, dirname, filenames):
         for f in filenames:

Modified: python/branches/py3k/Mac/scripts/cachersrc.py
==============================================================================
--- python/branches/py3k/Mac/scripts/cachersrc.py	(original)
+++ python/branches/py3k/Mac/scripts/cachersrc.py	Fri May  9 22:00:17 2008
@@ -39,7 +39,7 @@
         if o == '-f':
             force = 1
     for dir in sys.argv[1:]:
-        os.path.walk(dir, handler, (verbose, force))
+        os.walk(dir, handler, (verbose, force))
 
 if __name__ == '__main__':
     main()

Modified: python/branches/py3k/Mac/scripts/zappycfiles.py
==============================================================================
--- python/branches/py3k/Mac/scripts/zappycfiles.py	(original)
+++ python/branches/py3k/Mac/scripts/zappycfiles.py	Fri May  9 22:00:17 2008
@@ -22,7 +22,7 @@
         zappyc(dir)
 
 def zappyc(dir):
-    os.path.walk(dir, walker, None)
+    os.walk(dir, walker, None)
 
 def walker(dummy, top, names):
     for name in names:

Modified: python/branches/py3k/Tools/i18n/pygettext.py
==============================================================================
--- python/branches/py3k/Tools/i18n/pygettext.py	(original)
+++ python/branches/py3k/Tools/i18n/pygettext.py	Fri May  9 22:00:17 2008
@@ -341,7 +341,7 @@
     if os.path.isdir(name):
         # find all python files in directory
         list = []
-        os.path.walk(name, _visit_pyfiles, list)
+        os.walk(name, _visit_pyfiles, list)
         return list
     elif os.path.exists(name):
         # a single file

Modified: python/branches/py3k/Tools/scripts/findlinksto.py
==============================================================================
--- python/branches/py3k/Tools/scripts/findlinksto.py	(original)
+++ python/branches/py3k/Tools/scripts/findlinksto.py	Fri May  9 22:00:17 2008
@@ -22,7 +22,7 @@
     pat, dirs = args[0], args[1:]
     prog = re.compile(pat)
     for dirname in dirs:
-        os.path.walk(dirname, visit, prog)
+        os.walk(dirname, visit, prog)
 
 def visit(prog, dirname, names):
     if os.path.islink(dirname):

Modified: python/branches/py3k/Tools/versioncheck/checkversions.py
==============================================================================
--- python/branches/py3k/Tools/versioncheck/checkversions.py	(original)
+++ python/branches/py3k/Tools/versioncheck/checkversions.py	Fri May  9 22:00:17 2008
@@ -31,7 +31,7 @@
             print('** Exception in', fullname)
 
 def walk1tree(tree):
-    os.path.walk(tree, check1dir, None)
+    os.walk(tree, check1dir, None)
 
 def main():
     global VERBOSE

Modified: python/branches/py3k/setup.py
==============================================================================
--- python/branches/py3k/setup.py	(original)
+++ python/branches/py3k/setup.py	Fri May  9 22:00:17 2008
@@ -1574,7 +1574,7 @@
 
     def set_dir_modes(self, dirname, mode):
         if not self.is_chmod_supported(): return
-        os.path.walk(dirname, self.set_dir_modes_visitor, mode)
+        os.walk(dirname, self.set_dir_modes_visitor, mode)
 
     def set_dir_modes_visitor(self, mode, dirname, names):
         if os.path.islink(dirname): return


More information about the Python-3000-checkins mailing list