mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 23:53:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Try backing out 54407 to see if it corrects the problems on the Windows

Browse source 
buildbots.  This rev was backported, so we will need to keep both branches
in sync, pending the outcome of the test after this checkin.
This commit is contained in:
Neal Norwitz 2007-03-20 05:23:09 +00:00
parent c473d5ebab
commit c990f6454f
4 changed files with 19 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/os.py
View file

@ -221,7 +221,7 @@ def renames(old, new):
__all__.extend(["makedirs", "removedirs", "renames"])
def walk(top, topdown=True, onerror=None, followlinks=False):
def walk(top, topdown=True, onerror=None):
"""Directory tree generator.
For each directory in the directory tree rooted at top (including top
@ -257,10 +257,6 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
to abort the walk. Note that the filename is available as the
filename attribute of the exception object.
By default, os.walk does not follow symbolic links to subdirectories on
systems that support them. In order to get this functionality, set the
optional argument 'followlinks' to true.
Caution: if you pass a relative pathname for top, don't change the
current working directory between resumptions of walk. walk never
changes the current directory, and assumes that the client doesn't
@ -304,8 +300,8 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
yield top, dirs, nondirs
for name in dirs:
path = join(top, name)
if followlinks or not islink(path):
for x in walk(path, topdown, onerror, followlinks):
if not islink(path):
for x in walk(path, topdown, onerror):
yield x
if not topdown:
yield top, dirs, nondirs