summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2016-04-25 14:27:49 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2016-04-25 14:27:49 (GMT)
commit3211595bef0c13d10c814d7dd35a96810e66c8d3 (patch)
tree2a798ccaf88b7acf7234962e71c5430d9820ea6f /Doc
parent42d9b02c04e848ea5e337b60afbfd72fee08649b (diff)
parentd3304e3e20651665bdafd29ffbdf64f50ac753e6 (diff)
downloadcpython-3211595bef0c13d10c814d7dd35a96810e66c8d3.zip
cpython-3211595bef0c13d10c814d7dd35a96810e66c8d3.tar.gz
cpython-3211595bef0c13d10c814d7dd35a96810e66c8d3.tar.bz2
Merge with 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/os.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 051db99..6339d01 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1624,8 +1624,8 @@ features:
Create a directory named *path* with numeric mode *mode*.
On some systems, *mode* is ignored. Where it is used, the current umask
- value is first masked out. If the directory already exists, :exc:`OSError`
- is raised.
+ value is first masked out. If the directory already exists,
+ :exc:`FileExistsError` is raised.
This function can also support :ref:`paths relative to directory descriptors
<dir_fd>`.