Close all the handles

Author: TomAugspurger

pandas/conftest.py

@@ -31,16 +31,6 @@ def pytest_addoption(parser):
                      help="Fail if a test is skipped for missing data file.")
 
 
-def pytest_collection_modifyitems(items):
-    # Make unhandled ResourceWarnings fail early to track down
-    # https://github.com/pandas-dev/pandas/issues/22675
-    if PY3:
-        for item in items:
-            item.add_marker(
-                pytest.mark.filterwarnings("error::ResourceWarning")
-            )
-
-
 def pytest_runtest_setup(item):
     if 'slow' in item.keywords and item.config.getoption("--skip-slow"):
         pytest.skip("skipping due to --skip-slow")

pandas/io/common.py

@@ -386,6 +386,8 @@ def _get_handle(path_or_buf, mode, encoding=None, compression=None,
         # ZIP Compression
         elif compression == 'zip':
             zf = BytesZipFile(path_or_buf, mode)
+            # Ensure the container is closed as well.
+            handles.append(zf)
             if zf.mode == 'w':
                 f = zf
             elif zf.mode == 'r':

pandas/tests/io/parser/compression.py

@@ -30,9 +30,8 @@ def test_zip(self):
             expected = self.read_csv(self.csv1)
 
         with tm.ensure_clean('test_file.zip') as path:
-            tmp = zipfile.ZipFile(path, mode='w')
-            tmp.writestr('test_file', data)
-            tmp.close()
+            with zipfile.ZipFile(path, mode='w') as tmp:
+                tmp.writestr('test_file', data)
 
             result = self.read_csv(path, compression='zip')
             tm.assert_frame_equal(result, expected)
@@ -47,10 +46,9 @@ def test_zip(self):
 
         with tm.ensure_clean('combined_zip.zip') as path:
             inner_file_names = ['test_file', 'second_file']
-            tmp = zipfile.ZipFile(path, mode='w')
-            for file_name in inner_file_names:
-                tmp.writestr(file_name, data)
-            tmp.close()
+            with zipfile.ZipFile(path, mode='w') as tmp:
+                for file_name in inner_file_names:
+                    tmp.writestr(file_name, data)
 
             tm.assert_raises_regex(ValueError, 'Multiple files',
                                    self.read_csv, path, compression='zip')
@@ -60,8 +58,8 @@ def test_zip(self):
                                    compression='infer')
 
         with tm.ensure_clean() as path:
-            tmp = zipfile.ZipFile(path, mode='w')
-            tmp.close()
+            with zipfile.ZipFile(path, mode='w') as tmp:
+                pass
 
             tm.assert_raises_regex(ValueError, 'Zero files',
                                    self.read_csv, path, compression='zip')
@@ -84,9 +82,8 @@ def test_other_compression(self, compress_type, compress_method, ext):
             expected = self.read_csv(self.csv1)
 
         with tm.ensure_clean() as path:
-            tmp = compress_method(path, mode='wb')
-            tmp.write(data)
-            tmp.close()
+            with compress_method(path, mode='wb') as tmp:
+                tmp.write(data)
 
             result = self.read_csv(path, compression=compress_type)
             tm.assert_frame_equal(result, expected)
@@ -100,9 +97,8 @@ def test_other_compression(self, compress_type, compress_method, ext):
                 tm.assert_frame_equal(result, expected)
 
         with tm.ensure_clean('test.{}'.format(ext)) as path:
-            tmp = compress_method(path, mode='wb')
-            tmp.write(data)
-            tmp.close()
+            with compress_method(path, mode='wb') as tmp:
+                tmp.write(data)
             result = self.read_csv(path, compression='infer')
             tm.assert_frame_equal(result, expected)
 

pandas/tests/io/test_pickle.py

@@ -333,9 +333,9 @@ def compress_file(self, src_path, dest_path, compression):
             f = bz2.BZ2File(dest_path, "w")
         elif compression == 'zip':
             import zipfile
-            f = zipfile.ZipFile(dest_path, "w",
-                                compression=zipfile.ZIP_DEFLATED)
-            f.write(src_path, os.path.basename(src_path))
+            with zipfile.ZipFile(dest_path, "w",
+                                 compression=zipfile.ZIP_DEFLATED) as f:
+                f.write(src_path, os.path.basename(src_path))
         elif compression == 'xz':
             lzma = pandas.compat.import_lzma()
             f = lzma.LZMAFile(dest_path, "w")
@@ -344,9 +344,8 @@ def compress_file(self, src_path, dest_path, compression):
             raise ValueError(msg)
 
         if compression != "zip":
-            with open(src_path, "rb") as fh:
+            with open(src_path, "rb") as fh, f:
                 f.write(fh.read())
-        f.close()
 
     def test_write_explicit(self, compression, get_random_path):
         base = get_random_path

pandas/util/testing.py

@@ -205,8 +205,12 @@ def decompress_file(path, compression):
         msg = 'Unrecognized compression type: {}'.format(compression)
         raise ValueError(msg)
 
-    yield f
-    f.close()
+    try:
+        yield f
+    finally:
+        f.close()
+        if compression == "zip":
+            zip_file.close()
 
 
 def assert_almost_equal(left, right, check_dtype="equiv",