summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-08-07 16:39:30 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-08-07 16:39:30 (GMT)
commit304e542ccd8dd2dc6c6f363a2a0c3c131c64a6ca (patch)
tree115c0e1ca61d921868ff4cc7444c212cc866c56e
parentdd50b0aa3ab361359f4eb724568e7894cff30c7f (diff)
parent41ad77c69718e7864eac62c8cd9034c3b51fb93e (diff)
downloadcpython-304e542ccd8dd2dc6c6f363a2a0c3c131c64a6ca.zip
cpython-304e542ccd8dd2dc6c6f363a2a0c3c131c64a6ca.tar.gz
cpython-304e542ccd8dd2dc6c6f363a2a0c3c131c64a6ca.tar.bz2
Issue #20056: Fixed deprecation warning about bytes path in test_shutil on
Windows. Path by Vajrasky Kok.
-rw-r--r--Lib/test/test_shutil.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 511efa6..a41d88b 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -10,6 +10,7 @@ import os.path
import errno
import functools
import subprocess
+from contextlib import ExitStack
from test import support
from test.support import TESTFN
from os.path import splitdrive
@@ -122,7 +123,9 @@ class TestShutil(unittest.TestCase):
write_file(os.path.join(victim, 'somefile'), 'foo')
victim = os.fsencode(victim)
self.assertIsInstance(victim, bytes)
- shutil.rmtree(victim)
+ win = (os.name == 'nt')
+ with self.assertWarns(DeprecationWarning) if win else ExitStack():
+ shutil.rmtree(victim)
@support.skip_unless_symlink
def test_rmtree_fails_on_symlink(self):