diff options
| author | Georg Brandl <georg@python.org> | 2013-10-06 17:27:17 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-06 17:27:17 (GMT) |
| commit | aca718e9f1f1f5193a6a6a20abd06150b0e34b86 (patch) | |
| tree | 66e7c880357676bbcbb78eb7e498a5c104577d09 /Doc | |
| parent | a2a7e243aa98d439c8626d5ff242ac537d3083f3 (diff) | |
| parent | 136a050bf3636b282c4c0c96bd177992425dfef1 (diff) | |
| download | cpython-aca718e9f1f1f5193a6a6a20abd06150b0e34b86.zip cpython-aca718e9f1f1f5193a6a6a20abd06150b0e34b86.tar.gz cpython-aca718e9f1f1f5193a6a6a20abd06150b0e34b86.tar.bz2 | |
merge with 3.3
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/os.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 246527d..2e46194 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1612,8 +1612,8 @@ features: The default *mode* is ``0o777`` (octal). On some systems, *mode* is ignored. Where it is used, the current umask value is first masked out. - If *exists_ok* is ``False`` (the default), an :exc:`OSError` is raised if - the target directory already exists. If *exists_ok* is ``True`` an + If *exist_ok* is ``False`` (the default), an :exc:`OSError` is raised if + the target directory already exists. If *exist_ok* is ``True`` an :exc:`OSError` is still raised if the umask-masked *mode* is different from the existing mode, on systems where the mode is used. :exc:`OSError` will also be raised if the directory creation fails. |