diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-10-23 12:39:20 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-10-23 12:39:20 +0200 |
| commit | 4487a46727b90dcce47efd9f000f842ff59fba1d (patch) | |
| tree | 81a6f96af8ae4590f1e4d96fe2c8907ce3342e07 | |
| parent | db41fd43cf60ed22e3c3b2f55101b48f9ae3d215 (diff) | |
| parent | de6e800f45b292c6290359ddbe9f079de3e08663 (diff) | |
| download | cpython-git-4487a46727b90dcce47efd9f000f842ff59fba1d.tar.gz | |
Merge 3.4 (Issue #25461)
| -rw-r--r-- | Doc/library/os.rst | 6 | ||||
| -rw-r--r-- | Misc/ACKS | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index dcd5e65aad..c1193add13 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -2529,9 +2529,9 @@ features: recurse into the subdirectories whose names remain in *dirnames*; this can be used to prune the search, impose a specific order of visiting, or even to inform :func:`walk` about directories the caller creates or renames before it resumes - :func:`walk` again. Modifying *dirnames* when *topdown* is ``False`` is - ineffective, because in bottom-up mode the directories in *dirnames* are - generated before *dirpath* itself is generated. + :func:`walk` again. Modifying *dirnames* when *topdown* is ``False`` has + no effect on the behavior of the walk, because in bottom-up mode the directories + in *dirnames* are generated before *dirpath* itself is generated. By default, errors from the :func:`listdir` call are ignored. If optional argument *onerror* is specified, it should be a function; it will be called with @@ -1246,6 +1246,7 @@ Rusty Russell Nick Russo James Rutherford Chris Ryland +Bernt Røskar Brenna Constantina S. Patrick Sabin Sébastien Sablé |