[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

http://hg.python.org/cpython/rev/42433f4fa6d5
changeset:   90099:42433f4fa6d5
parent:      90097:adfcdc831e98
parent:      90098:2099da2fd317
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Apr 01 19:22:14 2014 -0400
summary:
  merge 3.4

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


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1632,12 +1632,12 @@
    .. versionadded:: 3.2
       The *exist_ok* parameter.
 
-   .. versionchanged:: 3.3.6
-
-      Before Python 3.3.6, if *exist_ok* was ``True`` and the directory existed,
+   .. versionchanged:: 3.4.1
+
+      Before Python 3.4.1, if *exist_ok* was ``True`` and the directory existed,
       :func:`makedirs` would still raise an error if *mode* did not match the
       mode of the existing directory. Since this behavior was impossible to
-      implement safely, it was removed in Python 3.3.6. See :issue:`21082`.
+      implement safely, it was removed in Python 3.4.1. See :issue:`21082`.
 
 
 .. function:: mkfifo(path, mode=0o666, *, dir_fd=None)

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