summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_shutil.py
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2012-06-24 06:43:06 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2012-06-24 06:43:06 (GMT)
commit5b0eca116ad1b9509ebe4620f1685d86ce4433bf (patch)
tree06028b901fd8bd82fb14cf108c399b8626dce196 /Lib/test/test_shutil.py
parent8e5c0a774fd8c51fdf5654a6d6688a09e62d6c5e (diff)
downloadcpython-5b0eca116ad1b9509ebe4620f1685d86ce4433bf.zip
cpython-5b0eca116ad1b9509ebe4620f1685d86ce4433bf.tar.gz
cpython-5b0eca116ad1b9509ebe4620f1685d86ce4433bf.tar.bz2
Issue #4489: Rename the feature marker for the symlink resistant rmtree and store it as a function attribute
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 b2ac0cf..067889e 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.