]> granicus.if.org Git - python/commitdiff
Issue #20056: Fixed deprecation warning about bytes path in test_shutil on
authorSerhiy Storchaka <storchaka@gmail.com>
Thu, 7 Aug 2014 16:38:37 +0000 (19:38 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Thu, 7 Aug 2014 16:38:37 +0000 (19:38 +0300)
Windows.  Path by Vajrasky Kok.

Lib/test/test_shutil.py

index a483fe127ca93d7aa2aa96c601098c403057cf9f..66b3fb19572f023e077edf40bad3e20370dba628 100644 (file)
@@ -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
@@ -116,7 +117,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):