[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

http://hg.python.org/cpython/rev/2b2da4ae86b4
changeset:   92284:2b2da4ae86b4
parent:      92280:28cbbe2ce104
parent:      92283:c3cecf8e7497
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Aug 31 17:22:27 2014 -0400
summary:
  merge 3.4

files:
  Lib/distutils/tests/test_dir_util.py |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Lib/distutils/tests/test_dir_util.py b/Lib/distutils/tests/test_dir_util.py
--- a/Lib/distutils/tests/test_dir_util.py
+++ b/Lib/distutils/tests/test_dir_util.py
@@ -2,7 +2,6 @@
 import unittest
 import os
 import stat
-import shutil
 import sys
 
 from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
@@ -52,7 +51,7 @@
         self.assertEqual(self._logs, wanted)
 
     @unittest.skipIf(sys.platform.startswith('win'),
-                        "This test is only appropriate for POSIX-like systems.")
+        "This test is only appropriate for POSIX-like systems.")
     def test_mkpath_with_custom_mode(self):
         # Get and set the current umask value for testing mode bits.
         umask = os.umask(0o002)

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