Index: Lib/os.py =================================================================== --- Lib/os.py (revision 88915) +++ Lib/os.py (working copy) @@ -286,15 +286,18 @@ else: nondirs.append(name) + from collections import namedtuple + walktuple = namedtuple('walktuple', 'dirpath dirnames filenames') + if topdown: - yield top, dirs, nondirs + yield walktuple(top, dirs, nondirs) for name in dirs: new_path = join(top, name) if followlinks or not islink(new_path): for x in walk(new_path, topdown, onerror, followlinks): yield x if not topdown: - yield top, dirs, nondirs + yield walktuple(top, dirs, nondirs) __all__.append("walk")