mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 19:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge 3.4 (Issue #25461)

Browse source
This commit is contained in:
Victor Stinner 2015-10-23 12:39:01 +02:00
commit de6e800f45
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Doc/library/os.rst
View file

@ -2529,9 +2529,9 @@ features:
recurse into the subdirectories whose names remain in *dirnames*; this can be 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 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` about directories the caller creates or renames before it resumes
:func:`walk` again. Modifying *dirnames* when *topdown* is ``False`` is :func:`walk` again. Modifying *dirnames* when *topdown* is ``False`` has
ineffective, because in bottom-up mode the directories in *dirnames* are no effect on the behavior of the walk, because in bottom-up mode the directories
generated before *dirpath* itself is generated. in *dirnames* are generated before *dirpath* itself is generated.
By default, errors from the :func:`listdir` call are ignored. If optional 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 argument *onerror* is specified, it should be a function; it will be called with

1
Misc/ACKS
View file

@ -1244,6 +1244,7 @@ Rusty Russell
Nick Russo Nick Russo
James Rutherford James Rutherford
Chris Ryland Chris Ryland
Bernt Røskar Brenna
Constantina S. Constantina S.
Patrick Sabin Patrick Sabin
Sébastien Sablé Sébastien Sablé