Move test_imp over to file context managers.

Lib/test/test_imp.py

@@ -55,27 +55,27 @@ class ImportTests(unittest.TestCase):
 
     def test_find_module_encoding(self):
         for mod, encoding, _ in self.test_strings:
-            fd = imp.find_module('module_' + mod, self.test_path)[0]
+            with imp.find_module('module_' + mod, self.test_path)[0] as fd:
                 self.assertEqual(fd.encoding, encoding)
 
     def test_issue1267(self):
         for mod, encoding, _ in self.test_strings:
             fp, filename, info  = imp.find_module('module_' + mod,
                                                   self.test_path)
+            with fp:
                 self.assertNotEqual(fp, None)
                 self.assertEqual(fp.encoding, encoding)
                 self.assertEqual(fp.tell(), 0)
                 self.assertEqual(fp.readline(), '# test %s encoding\n'
                                  % encoding)
-            fp.close()
 
         fp, filename, info = imp.find_module("tokenize")
+        with fp:
             self.assertNotEqual(fp, None)
             self.assertEqual(fp.encoding, "utf-8")
             self.assertEqual(fp.tell(), 0)
             self.assertEqual(fp.readline(),
                              '"""Tokenization help for Python programs.\n')
-        fp.close()
 
     def test_issue3594(self):
         temp_mod_name = 'test_imp_helper'
@@ -140,6 +140,7 @@ class ImportTests(unittest.TestCase):
             with open(temp_mod_name + '.py', 'w') as file:
                 file.write('a = 1\n')
             file, filename, info = imp.find_module(temp_mod_name)
+            with file:
                 self.assertIsNotNone(file)
                 self.assertTrue(filename[:-3].endswith(temp_mod_name))
                 self.assertEqual(info[0], '.py')
@@ -148,7 +149,6 @@ class ImportTests(unittest.TestCase):
 
                 mod = imp.load_module(temp_mod_name, file, filename, info)
                 self.assertEqual(mod.a, 1)
-            file.close()
 
             mod = imp.load_source(temp_mod_name, temp_mod_name + '.py')
             self.assertEqual(mod.a, 1)