summaryrefslogtreecommitdiffstats
path: root/Doc/library/shutil.rst
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2012-07-19 19:41:02 (GMT)
committerHynek Schlawack <hs@ox.cx>2012-07-19 19:41:02 (GMT)
commit26fe37dd3f5b994722eb093f95e917282368d7da (patch)
tree7ec04c2239d15b0769faaea76fea96c2bd05e5e6 /Doc/library/shutil.rst
parent024abca053dd18b474b41eba2331d35b24c3bae3 (diff)
downloadcpython-26fe37dd3f5b994722eb093f95e917282368d7da.zip
cpython-26fe37dd3f5b994722eb093f95e917282368d7da.tar.gz
cpython-26fe37dd3f5b994722eb093f95e917282368d7da.tar.bz2
#1492704: Backout and wait for 3.4
Diffstat (limited to 'Doc/library/shutil.rst')
-rw-r--r--Doc/library/shutil.rst12
1 files changed, 1 insertions, 11 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index d019137..8ed7e9e 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -52,7 +52,7 @@ Directory and files operations
Copy the contents (no metadata) of the file named *src* to a file named
*dst* and return *dst*. *dst* must be the complete target file name; look at
:func:`shutil.copy` for a copy that accepts a target directory path. If
- *src* and *dst* are the same files, :exc:`SameFileError` is raised.
+ *src* and *dst* are the same files, :exc:`Error` is raised.
The destination location must be writable; otherwise, an :exc:`OSError` exception
will be raised. If *dst* already exists, it will be replaced. Special files
@@ -67,16 +67,6 @@ Directory and files operations
:exc:`IOError` used to be raised instead of :exc:`OSError`.
Added *follow_symlinks* argument.
Now returns *dst*.
- Raise :exc:`SameFileError` instead of :exc:`Error`.
-
-
-.. exception:: SameFileError
-
- This exception is raised if source and destination in :func:`copyfile`
- are the same file.
-
- .. versionadded:: 3.3
-
.. function:: copymode(src, dst, *, follow_symlinks=True)