changeset:   98837:db07937b3e49
parent:      98834:bbb4c2c43aea
parent:      98836:9f68e41fb4a7
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Fri Oct 23 12:39:20 2015 +0200
files:       Doc/library/os.rst Misc/ACKS
description:
Merge 3.4 (Issue #25461)


diff -r bbb4c2c43aea -r db07937b3e49 Doc/library/os.rst
--- a/Doc/library/os.rst	Thu Oct 22 22:48:16 2015 -0700
+++ b/Doc/library/os.rst	Fri Oct 23 12:39:20 2015 +0200
@@ -2529,9 +2529,9 @@
    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
diff -r bbb4c2c43aea -r db07937b3e49 Misc/ACKS
--- a/Misc/ACKS	Thu Oct 22 22:48:16 2015 -0700
+++ b/Misc/ACKS	Fri Oct 23 12:39:20 2015 +0200
@@ -1246,6 +1246,7 @@
 Nick Russo
 James Rutherford
 Chris Ryland
+Bernt Røskar Brenna
 Constantina S.
 Patrick Sabin
 Sébastien Sablé