Merge pull request #3366 from pypa/feature/distutils-75ed79d

Merge with pypa/distutils@75ed79d

1 files changed, 19 insertions, 14 deletions

diff --git a/setuptools/_distutils/tests/test_dir_util.py b/setuptools/_distutils/tests/test_dir_util.py
index 1b1f3bbb..a1f9a240 100644
--- a/setuptools/_distutils/tests/test_dir_util.py
+++ b/setuptools/_distutils/tests/test_dir_util.py
@@ -6,8 +6,13 @@ import sys
 from unittest.mock import patch
 
 from distutils import dir_util, errors
-from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
-                                ensure_relative)
+from distutils.dir_util import (
+    mkpath,
+    remove_tree,
+    create_tree,
+    copy_tree,
+    ensure_relative,
+)
 
 from distutils import log
 from distutils.tests import support
@@ -15,7 +20,6 @@ from test.support import run_unittest
 
 
 class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
-
     def _log(self, msg, *args):
         if len(args) > 0:
             self._logs.append(msg % args)
@@ -44,8 +48,7 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
         remove_tree(self.root_target, verbose=0)
 
         mkpath(self.target, verbose=1)
-        wanted = ['creating %s' % self.root_target,
-                  'creating %s' % self.target]
+        wanted = ['creating %s' % self.root_target, 'creating %s' % self.target]
         self.assertEqual(self._logs, wanted)
         self._logs = []
 
@@ -53,18 +56,18 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
         wanted = ["removing '%s' (and everything under it)" % self.root_target]
         self.assertEqual(self._logs, wanted)
 
-    @unittest.skipIf(sys.platform.startswith('win'),
-        "This test is only appropriate for POSIX-like systems.")
+    @unittest.skipIf(
+        sys.platform.startswith('win'),
+        "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)
         os.umask(umask)
         mkpath(self.target, 0o700)
-        self.assertEqual(
-            stat.S_IMODE(os.stat(self.target).st_mode), 0o700 & ~umask)
+        self.assertEqual(stat.S_IMODE(os.stat(self.target).st_mode), 0o700 & ~umask)
         mkpath(self.target2, 0o555)
-        self.assertEqual(
-            stat.S_IMODE(os.stat(self.target2).st_mode), 0o555 & ~umask)
+        self.assertEqual(stat.S_IMODE(os.stat(self.target2).st_mode), 0o555 & ~umask)
 
     def test_create_tree_verbosity(self):
 
@@ -118,7 +121,7 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
         if os.sep == '/':
             self.assertEqual(ensure_relative('/home/foo'), 'home/foo')
             self.assertEqual(ensure_relative('some/path'), 'some/path')
-        else:   # \\
+        else:  # \\
             self.assertEqual(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
             self.assertEqual(ensure_relative('home\\foo'), 'home\\foo')
 
@@ -126,8 +129,9 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
         """
         An exception in listdir should raise a DistutilsFileError
         """
-        with patch("os.listdir", side_effect=OSError()), \
-             self.assertRaises(errors.DistutilsFileError):
+        with patch("os.listdir", side_effect=OSError()), self.assertRaises(
+            errors.DistutilsFileError
+        ):
             src = self.tempdirs[-1]
             dir_util.copy_tree(src, None)
 
@@ -135,5 +139,6 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
 def test_suite():
     return unittest.TestLoader().loadTestsFromTestCase(DirUtilTestCase)
 
+
 if __name__ == "__main__":
     run_unittest(test_suite())