diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-03-22 14:15:12 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-03-22 14:15:12 (GMT) |
| commit | 67057ab57cd7e4872d9483cf259f7c26c992adcc (patch) | |
| tree | d9742e4cd5f9ffb4385b87e1ccc91c7cd11ccb8e | |
| parent | 2f7bf239259319b058f8a6f77f910930460ce038 (diff) | |
| parent | 218144a94d54e5219a1d63fd07775a41059afcd6 (diff) | |
| download | cpython-67057ab57cd7e4872d9483cf259f7c26c992adcc.zip cpython-67057ab57cd7e4872d9483cf259f7c26c992adcc.tar.gz cpython-67057ab57cd7e4872d9483cf259f7c26c992adcc.tar.bz2 | |
merge 3.4 (#22933)
| -rw-r--r-- | Doc/library/shutil.rst | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst index 82974ad..3b467e0 100644 --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -288,12 +288,9 @@ Directory and files operations Recursively move a file or directory (*src*) to another location (*dst*) and return the destination. - If the destination is a directory or a symlink to a directory, then *src* is - moved inside that directory. - - The destination directory must not already exist. If the destination already - exists but is not a directory, it may be overwritten depending on - :func:`os.rename` semantics. + If the destination is an existing directory, then *src* is moved inside that + directory. If the destination already exists but is not a directory, it may + be overwritten depending on :func:`os.rename` semantics. If the destination is on the current filesystem, then :func:`os.rename` is used. Otherwise, *src* is copied to *dst* using *copy_function* and then |