summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-04-01 19:22:14 -0400
committerBenjamin Peterson <benjamin@python.org>2014-04-01 19:22:14 -0400
commitd03e47c4053205460c282a246f944c09d0d600a9 (patch)
tree25a509791e77da9db2b28e5f9cf81d75dd3337df
parent18395290c380c8051ec5577f8886c1159eb54cef (diff)
parent1acc69c650edbea4e273f2184168d1fde5a74911 (diff)
downloadcpython-git-d03e47c4053205460c282a246f944c09d0d600a9.tar.gz
merge 3.4
-rw-r--r--Doc/library/os.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 326114fa4f..3d492ba1b0 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1632,12 +1632,12 @@ features:
.. versionadded:: 3.2
The *exist_ok* parameter.
- .. versionchanged:: 3.3.6
+ .. versionchanged:: 3.4.1
- Before Python 3.3.6, if *exist_ok* was ``True`` and the directory existed,
+ 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)