cpython: 1411df211159 (original) (raw)

Mercurial > cpython

changeset 91196:1411df211159

merge 3.4 (#13779) [#13779]

Benjamin Peterson benjamin@python.org
date	Sun, 15 Jun 2014 20:52:02 -0700
parents	da783a1f1a62(current diff)b10322b5ef0f(diff)
children	754995a0e20d
files	Doc/library/os.rst
diffstat	2 files changed, 12 insertions(+), 8 deletions(-)[+] [-] Doc/library/os.rst 8 Lib/os.py 12

line wrap: on

line diff

--- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -2236,9 +2236,11 @@ features: If optional argument topdown is True or not specified, the triple for a directory is generated before the triples for any of its subdirectories

(directories are generated top-down). If topdown is False, the triple for a
directory is generated after the triples for all of its subdirectories
(directories are generated bottom-up).

(directories are generated top-down). If topdown is False, the triple
for a directory is generated after the triples for all of its subdirectories
(directories are generated bottom-up). No matter the value of topdown, the
list of subdirectories is retrieved before the tuples for the directory and
its subdirectories are generated. When topdown is True, the caller can modify the dirnames list in-place (perhaps using :keyword:del or slice assignment), and :func:walk will only

--- a/Lib/os.py +++ b/Lib/os.py @@ -312,11 +312,12 @@ def walk(top, topdown=True, onerror=None When topdown is true, the caller can modify the dirnames list in-place (e.g., via del or slice assignment), and walk will only recurse into the

subdirectories whose names remain in dirnames; this can be used to prune
the search, or to impose a specific order of visiting. Modifying
dirnames when topdown is false is ineffective, since the directories in
dirnames have already been generated by the time dirnames itself is
generated.

subdirectories whose names remain in dirnames; this can be used to prune the
search, or to impose a specific order of visiting. Modifying dirnames when
topdown is false is ineffective, since the directories in dirnames have
already been generated by the time dirnames itself is generated. No matter
the value of topdown, the list of subdirectories is retrieved before the
tuples for the directory and its subdirectories are generated.

By default errors from the os.listdir() call are ignored. If optional arg 'onerror' is specified, it should be a function; it @@ -344,6 +345,7 @@ def walk(top, topdown=True, onerror=None print("bytes in", len(files), "non-directory files") if 'CVS' in dirs: dirs.remove('CVS') # don't visit CVS directories + """ islink, join, isdir = path.islink, path.join, path.isdir