Merge pull request #622 from miurahr/topic/miurahr/fix-exception-hand…

…ling-fp-close

fix: unintended unclosed status when exception

py7zr/py7zr.py

@@ -393,7 +393,6 @@ def __init__(
             raise TypeError(f"invalid file: {type(file)}")
         self.encoded_header_mode = True
         self.header_encryption = header_encryption
-        self._fileRefCnt = 1
         try:
             if mode == "r":
                 self._real_get_contents(password)
@@ -428,9 +427,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         self.close()
 
     def _fpclose(self) -> None:
-        assert self._fileRefCnt > 0
-        self._fileRefCnt -= 1
-        if not self._fileRefCnt and not self._filePassed:
+        if not self._filePassed:
             self.fp.close()
 
     def _real_get_contents(self, password) -> None:

tests/test_basic.py

@@ -5,6 +5,7 @@
 import shutil
 from io import BytesIO
 
+import _lzma
 import pytest
 
 import py7zr
@@ -140,12 +141,22 @@ def test_digests():
 
 
 @pytest.mark.basic
-def test_digests_corrupted():
+def test_digests_crc_corrupted():
     arcfile = os.path.join(testdata_path, "crc_corrupted.7z")
     with py7zr.SevenZipFile(arcfile) as archive:
         assert archive.test() is None
         archive.reset()
         assert archive.testzip() == "src/scripts/py7zr"
+    assert archive.fp.closed
+
+
+@pytest.mark.basic
+def test_digests_data_corrupted():
+    arcfile = os.path.join(testdata_path, "data_corrupted.7z")
+    with pytest.raises(_lzma.LZMAError):
+        with py7zr.SevenZipFile(arcfile) as archive:
+            archive.testzip()
+    assert archive.fp.closed
 
 
 @pytest.mark.unit