[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

[zach.ware]

https://hg.python.org/cpython/rev/e014be53e7b9
changeset:   101139:e014be53e7b9
parent:      101137:b3ad9c002bb8
parent:      101138:2c1651fbfbba
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Mon Apr 25 09:27:49 2016 -0500
summary:
  Merge with 3.5

files:
  Doc/library/os.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1624,8 +1624,8 @@
    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>`.

-- 
Repository URL: https://hg.python.org/cpython