Update tarfile tests to use context managers

Author: sodle

Lib/test/test_tarfile.py

@@ -694,10 +694,11 @@ def test_extract_hardlink(self):
     def test_extractall(self):
         # Test if extractall() correctly restores directory permissions
         # and times (see issue1735).
-        tar = tarfile.open(tarname, encoding="iso8859-1")
-        DIR = os.path.join(TEMPDIR, "extractall")
-        os.mkdir(DIR)
-        try:
+        DIR = pathlib.Path(TEMPDIR) / "extractall"
+        with (
+            os_helper.temp_dir(DIR),
+            tarfile.open(tarname, encoding="iso8859-1") as tar
+        ):
             directories = [t for t in tar if t.isdir()]
             tar.extractall(DIR, directories, filter='fully_trusted')
             for tarinfo in directories:
@@ -718,31 +719,24 @@ def format_mtime(mtime):
                     format_mtime(file_mtime),
                     path)
                 self.assertEqual(tarinfo.mtime, file_mtime, errmsg)
-        finally:
-            tar.close()
-            os_helper.rmtree(DIR)
 
     @staticmethod
-    @unittest.mock.patch("tarfile.data_filter", wraps=tarfile.data_filter)
-    @unittest.mock.patch("tarfile.tar_filter", wraps=tarfile.tar_filter)
-    @unittest.mock.patch("tarfile.fully_trusted_filter", wraps=tarfile.fully_trusted_filter)
-    def test_extractall_default_filter(mock_ft_filter: unittest.mock.Mock,
-                                       mock_tar_filter: unittest.mock.Mock,
-                                       mock_data_filter: unittest.mock.Mock):
-        tar = tarfile.open(tarname, encoding="iso8859-1")
-        DIR = os.path.join(TEMPDIR, "extractall_default_filter")
-        os.mkdir(DIR)
-        try:
+    def test_extractall_default_filter():
+        # Test that the default filter is now "data", and the other filter types are not used.
+        DIR = pathlib.Path(TEMPDIR) / "extractall_default_filter"
+        with (
+            os_helper.temp_dir(DIR),
+            tarfile.open(tarname, encoding="iso8859-1") as tar,
+            unittest.mock.patch("tarfile.data_filter", wraps=tarfile.data_filter) as mock_data_filter,
+            unittest.mock.patch("tarfile.tar_filter", wraps=tarfile.tar_filter) as mock_tar_filter,
+            unittest.mock.patch("tarfile.fully_trusted_filter", wraps=tarfile.fully_trusted_filter) as mock_ft_filter
+        ):
             directories = [t for t in tar if t.isdir()]
             tar.extractall(DIR, directories)
 
-            # Test that the default filter is now "data", and the other filter types are not used.
             mock_data_filter.assert_called()
             mock_ft_filter.assert_not_called()
             mock_tar_filter.assert_not_called()
-        finally:
-            tar.close()
-            os_helper.rmtree(DIR)
 
     @os_helper.skip_unless_working_chmod
     def test_extract_directory(self):