aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Lib/distutils/tests/test_dir_util.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/distutils/tests/test_dir_util.py')
-rw-r--r--Lib/distutils/tests/test_dir_util.py13
1 files changed, 3 insertions, 10 deletions
diff --git a/Lib/distutils/tests/test_dir_util.py b/Lib/distutils/tests/test_dir_util.py
index d82d9133d04..1589f1297db 100644
--- a/Lib/distutils/tests/test_dir_util.py
+++ b/Lib/distutils/tests/test_dir_util.py
@@ -10,7 +10,7 @@ from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
from distutils import log
from distutils.tests import support
-from test.test_support import run_unittest
+from test.support import run_unittest
class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
@@ -76,7 +76,6 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
remove_tree(self.root_target, verbose=0)
-
def test_copy_tree_verbosity(self):
mkpath(self.target, verbose=0)
@@ -88,11 +87,8 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
mkpath(self.target, verbose=0)
a_file = os.path.join(self.target, 'ok.txt')
- f = open(a_file, 'w')
- try:
+ with open(a_file, 'w') as f:
f.write('some content')
- finally:
- f.close()
wanted = ['copying %s -> %s' % (a_file, self.target2)]
copy_tree(self.target, self.target2, verbose=1)
@@ -107,11 +103,8 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
a_file = os.path.join(self.target, 'ok.txt')
nfs_file = os.path.join(self.target, '.nfs123abc')
for f in a_file, nfs_file:
- fh = open(f, 'w')
- try:
+ with open(f, 'w') as fh:
fh.write('some content')
- finally:
- fh.close()
copy_tree(self.target, self.target2)
self.assertEqual(os.listdir(self.target2), ['ok.txt'])