summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2008-05-09 20:00:17 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2008-05-09 20:00:17 (GMT)
commit4e6531e7dee5ff9b27c108e8614d336657e68a21 (patch)
tree43b23c55f5bd5c6872c71c928e2b68c78dff3880
parent14a767d4f499c8ead06a14d9c64c01c4ced95e61 (diff)
downloadcpython-4e6531e7dee5ff9b27c108e8614d336657e68a21.zip
cpython-4e6531e7dee5ff9b27c108e8614d336657e68a21.tar.gz
cpython-4e6531e7dee5ff9b27c108e8614d336657e68a21.tar.bz2
Removed remnants of os.path.walk().
-rw-r--r--Lib/os.py2
-rw-r--r--Mac/Tools/Doc/setup.py2
-rw-r--r--Mac/scripts/cachersrc.py2
-rw-r--r--Mac/scripts/zappycfiles.py2
-rwxr-xr-xTools/i18n/pygettext.py2
-rwxr-xr-xTools/scripts/findlinksto.py2
-rw-r--r--Tools/versioncheck/checkversions.py2
-rw-r--r--setup.py2
8 files changed, 8 insertions, 8 deletions
diff --git a/Lib/os.py b/Lib/os.py
index 97334f8..a489524 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -264,7 +264,7 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
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.
diff --git a/Mac/Tools/Doc/setup.py b/Mac/Tools/Doc/setup.py
index b020b40..a35152c 100644
--- a/Mac/Tools/Doc/setup.py
+++ b/Mac/Tools/Doc/setup.py
@@ -109,7 +109,7 @@ class DocBuild(build):
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:
diff --git a/Mac/scripts/cachersrc.py b/Mac/scripts/cachersrc.py
index e0e8415..49a20c0 100644
--- a/Mac/scripts/cachersrc.py
+++ b/Mac/scripts/cachersrc.py
@@ -39,7 +39,7 @@ def main():
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()
diff --git a/Mac/scripts/zappycfiles.py b/Mac/scripts/zappycfiles.py
index 77258da..b377e0d 100644
--- a/Mac/scripts/zappycfiles.py
+++ b/Mac/scripts/zappycfiles.py
@@ -22,7 +22,7 @@ def main():
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:
diff --git a/Tools/i18n/pygettext.py b/Tools/i18n/pygettext.py
index 69a19ef..4f0866e 100755
--- a/Tools/i18n/pygettext.py
+++ b/Tools/i18n/pygettext.py
@@ -341,7 +341,7 @@ def getFilesForName(name):
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
diff --git a/Tools/scripts/findlinksto.py b/Tools/scripts/findlinksto.py
index 4fde30d..d3da7e4 100755
--- a/Tools/scripts/findlinksto.py
+++ b/Tools/scripts/findlinksto.py
@@ -22,7 +22,7 @@ def main():
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):
diff --git a/Tools/versioncheck/checkversions.py b/Tools/versioncheck/checkversions.py
index ccb544d..f110cac 100644
--- a/Tools/versioncheck/checkversions.py
+++ b/Tools/versioncheck/checkversions.py
@@ -31,7 +31,7 @@ def check1dir(dummy, dir, files):
print('** Exception in', fullname)
def walk1tree(tree):
- os.path.walk(tree, check1dir, None)
+ os.walk(tree, check1dir, None)
def main():
global VERBOSE
diff --git a/setup.py b/setup.py
index 736fa21..d2e36b4 100644
--- a/setup.py
+++ b/setup.py
@@ -1574,7 +1574,7 @@ class PyBuildInstallLib(install_lib):
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