[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#19614)

benjamin.peterson python-checkins at python.org
Wed Mar 12 21:07:38 CET 2014


http://hg.python.org/cpython/rev/8a77e22aff6c
changeset:   89604:8a77e22aff6c
parent:      89602:efe527e0f802
parent:      89603:a5f767bf9d1c
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Mar 12 15:07:22 2014 -0500
summary:
  merge 3.3 (#19614)

files:
  Lib/test/test_support.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -102,7 +102,7 @@
                 self.assertTrue(os.path.isdir(path))
             self.assertFalse(os.path.isdir(path))
         finally:
-            shutil.rmtree(parent_dir)
+            support.rmtree(parent_dir)
 
     def test_temp_dir__path_none(self):
         """Test passing no path."""

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


More information about the Python-checkins mailing list