summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/library/os.rst3
-rw-r--r--Lib/os.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index c8bb5a9..58f01e9 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -3135,7 +3135,8 @@ features:
filenames)``.
*dirpath* is a string, the path to the directory. *dirnames* is a list of the
- names of the subdirectories in *dirpath* (excluding ``'.'`` and ``'..'``).
+ names of the subdirectories in *dirpath* (including symlinks to directories,
+ and excluding ``'.'`` and ``'..'``).
*filenames* is a list of the names of the non-directory files in *dirpath*.
Note that the names in the lists contain no path components. To get a full path
(which begins with *top*) to a file or directory in *dirpath*, do
diff --git a/Lib/os.py b/Lib/os.py
index d26cfc9..4f2ffce 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -288,7 +288,8 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
dirpath, dirnames, filenames
dirpath is a string, the path to the directory. dirnames is a list of
- the names of the subdirectories in dirpath (excluding '.' and '..').
+ the names of the subdirectories in dirpath (including symlinks to directories,
+ and excluding '.' and '..').
filenames is a list of the names of the non-directory files in dirpath.
Note that the names in the lists are just names, with no path components.
To get a full path (which begins with top) to a file or directory in