diff options
author | Benjamin Peterson <benjamin@python.org> | 2014-06-16 03:52:02 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2014-06-16 03:52:02 (GMT) |
commit | 5b521fc9de6b58707632eb0da4f871f37a525616 (patch) | |
tree | d3a3635729ffc6e387e2ac7631ee818515723d55 /Doc/library/os.rst | |
parent | 8ff4dfe857e7c4089c58b4abaf065baef4d5fadb (diff) | |
parent | e58e0c7f33c90c581c246b3bb9d803753eab987b (diff) | |
download | cpython-5b521fc9de6b58707632eb0da4f871f37a525616.zip cpython-5b521fc9de6b58707632eb0da4f871f37a525616.tar.gz cpython-5b521fc9de6b58707632eb0da4f871f37a525616.tar.bz2 |
merge 3.4 (#13779)
Diffstat (limited to 'Doc/library/os.rst')
-rw-r--r-- | Doc/library/os.rst | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 2f89ae4..f69f88b 100644 --- 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 |