[Python-checkins] cpython (merge 3.4 -> default): Issue #20056: Fixed deprecation warning about bytes path in test_shutil on

[serhiy.storchaka]

http://hg.python.org/cpython/rev/8480179d2a7f
changeset:   92038:8480179d2a7f
parent:      92036:3b1c44248635
parent:      92037:e306cf07046a
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Thu Aug 07 19:39:30 2014 +0300
summary:
  Issue #20056: Fixed deprecation warning about bytes path in test_shutil on
Windows.  Path by Vajrasky Kok.

files:
  Lib/test/test_shutil.py |  5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -10,6 +10,7 @@
 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 @@
         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):

-- 
Repository URL: http://hg.python.org/cpython