[Python-checkins] cpython (merge 3.5 -> default): Issue #27180: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/89821243621b
changeset:   102349:89821243621b
parent:      102347:800c069e16a0
parent:      102348:270fd4493195
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Thu Jul 14 07:45:24 2016 +0300
summary:
  Issue #27180: Merge from 3.5

files:
  Doc/library/pathlib.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst
--- a/Doc/library/pathlib.rst
+++ b/Doc/library/pathlib.rst
@@ -900,8 +900,9 @@
 
 .. method:: Path.rename(target)
 
-   Rename this file or directory to the given *target*.  *target* can be
-   either a string or another path object::
+   Rename this file or directory to the given *target*.  On Unix, if
+   *target* exists and is a file, it will be replaced silently if the user
+   has permission.  *target* can be either a string or another path object::
 
       >>> p = Path('foo')
       >>> p.open('w').write('some text')

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