summaryrefslogtreecommitdiff
path: root/Lib/test/test_shutil.py
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2012-06-24 00:24:31 -0700
committerGregory P. Smith <greg@krypto.org>2012-06-24 00:24:31 -0700
commit853ef475228e6fb9683209b361878e8f610e3762 (patch)
tree76c1bb1b08695b15c8206f49c8681f560b131d34 /Lib/test/test_shutil.py
parent990a5feba77de7fc5fd5ad5a16f61dc93667f63e (diff)
parent430d7a3090389606c2c9370d854a08eacc7f6823 (diff)
downloadcpython-git-853ef475228e6fb9683209b361878e8f610e3762.tar.gz
merge heads
Diffstat (limited to 'Lib/test/test_shutil.py')
-rw-r--r--Lib/test/test_shutil.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index b2ac0cf17c..067889e6b5 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -487,7 +487,7 @@ class TestShutil(unittest.TestCase):
def test_rmtree_uses_safe_fd_version_if_available(self):
if os.unlink in os.supports_dir_fd and os.open in os.supports_dir_fd:
self.assertTrue(shutil._use_fd_functions)
- self.assertTrue(shutil.rmtree_is_safe)
+ self.assertTrue(shutil.rmtree.avoids_symlink_attacks)
tmp_dir = self.mkdtemp()
d = os.path.join(tmp_dir, 'a')
os.mkdir(d)
@@ -502,7 +502,7 @@ class TestShutil(unittest.TestCase):
shutil._rmtree_safe_fd = real_rmtree
else:
self.assertFalse(shutil._use_fd_functions)
- self.assertFalse(shutil.rmtree_is_safe)
+ self.assertFalse(shutil.rmtree.avoids_symlink_attacks)
def test_rmtree_dont_delete_file(self):
# When called on a file instead of a directory, don't delete it.