merge 3.4

This commit is contained in:
Benjamin Peterson 2014-08-31 17:22:27 -04:00
commit c49a6aa1f0
1 changed files with 1 additions and 2 deletions

View File

@ -2,7 +2,6 @@
import unittest import unittest
import os import os
import stat import stat
import shutil
import sys import sys
from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree, from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
@ -52,7 +51,7 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
self.assertEqual(self._logs, wanted) self.assertEqual(self._logs, wanted)
@unittest.skipIf(sys.platform.startswith('win'), @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): def test_mkpath_with_custom_mode(self):
# Get and set the current umask value for testing mode bits. # Get and set the current umask value for testing mode bits.
umask = os.umask(0o002) umask = os.umask(0o002)