diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-10-23 10:39:01 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-10-23 10:39:01 (GMT) |
| commit | de6e800f45b292c6290359ddbe9f079de3e08663 (patch) | |
| tree | 85efec3d89fe750f45fc166142a7aadbaaa20ffa /Doc | |
| parent | 4575beba4b493fcae5e4eb308a31926da0ce24d1 (diff) | |
| parent | 0e316f688ef2499fe31ea7cf8e4884cf22863b0d (diff) | |
| download | cpython-de6e800f45b292c6290359ddbe9f079de3e08663.zip cpython-de6e800f45b292c6290359ddbe9f079de3e08663.tar.gz cpython-de6e800f45b292c6290359ddbe9f079de3e08663.tar.bz2 | |
Merge 3.4 (Issue #25461)
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/os.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 30f1605..0cc9d9c 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 |