summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_shutil.py
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2012-10-28 15:48:24 (GMT)
committerBrett Cannon <brett@python.org>2012-10-28 15:48:24 (GMT)
commit0e8c49d3583bbe86dd26f07819fd526eda8a0dcc (patch)
treecd085f2d606c69f7569e5006b6fa98faf7001197 /Lib/test/test_shutil.py
parent6a85f3cbe4b43860c527c43bd5da0220c4f96c0e (diff)
parent8ca705d5495f02ad93380e1f960adb98f7c00e22 (diff)
downloadcpython-0e8c49d3583bbe86dd26f07819fd526eda8a0dcc.zip
cpython-0e8c49d3583bbe86dd26f07819fd526eda8a0dcc.tar.gz
cpython-0e8c49d3583bbe86dd26f07819fd526eda8a0dcc.tar.bz2
merge
Diffstat (limited to 'Lib/test/test_shutil.py')
-rw-r--r--Lib/test/test_shutil.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index cbca767..c3997dc 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -1223,6 +1223,8 @@ class TestShutil(unittest.TestCase):
src_file = os.path.join(src_dir, 'foo')
write_file(src_file, 'foo')
self.assertRaises(SameFileError, shutil.copyfile, src_file, src_file)
+ # But Error should work too, to stay backward compatible.
+ self.assertRaises(Error, shutil.copyfile, src_file, src_file)
def test_copytree_return_value(self):
# copytree returns its destination path.