diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-10-18 10:00:36 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-10-18 10:00:36 (GMT) |
| commit | bb8606dae37b69c06d494f41470975d43385315b (patch) | |
| tree | 7d30a73714f7eae27112333c97d83f8bee3a93c1 /Doc | |
| parent | 5c267e2d22e90e4dcdcaef842634371b122970da (diff) | |
| parent | 67494f22243803422a91634945ae405c5a858939 (diff) | |
| download | cpython-bb8606dae37b69c06d494f41470975d43385315b.zip cpython-bb8606dae37b69c06d494f41470975d43385315b.tar.gz cpython-bb8606dae37b69c06d494f41470975d43385315b.tar.bz2 | |
#12277: merge with 3.2.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/os.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index a07071f..fe7e705 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -2168,7 +2168,7 @@ Files and Directories ineffective, 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 + 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 one argument, an :exc:`OSError` instance. It can report the error to continue with the walk, or raise the exception to abort the walk. Note that the filename |