Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/tarfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -2083,7 +2083,7 @@ def zstopen(cls, name, mode="r", fileobj=None, level=None, options=None,
if mode == 'r':
raise ReadError("not a zstd file") from e
raise
except Exception:
except:
fileobj.close()
raise
t._extfileobj = False
Expand Down
32 changes: 32 additions & 0 deletions Lib/test/test_tarfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,38 @@ class LzmaDetectReadTest(LzmaTest, DetectReadTest):
class ZstdDetectReadTest(ZstdTest, DetectReadTest):
pass


@support.requires_zstd()
class ZstdOpenTest(unittest.TestCase):
"""
See: https://github.com/python/cpython/issues/150077
"""
def test_zstopen_closes_fileobj_on_base_exception(self):
path = os_helper.TESTFN + ".tar.zst"
self.addCleanup(os_helper.unlink, path)
with tarfile.open(path, "w:zst"):
pass

opened = []
real_ZstdFile = zstd.ZstdFile

def tracking_ZstdFile(*args, **kwargs):
fileobj = real_ZstdFile(*args, **kwargs)
opened.append(fileobj)
return fileobj

with (
unittest.mock.patch("compression.zstd.ZstdFile", tracking_ZstdFile),
unittest.mock.patch.object(
tarfile.TarFile, "taropen", side_effect=KeyboardInterrupt),
self.assertRaises(KeyboardInterrupt),
):
tarfile.TarFile.zstopen(path)

self.assertEqual(len(opened), 1)
self.assertTrue(opened[0].closed)


class GzipBrokenHeaderCorrectException(GzipTest, unittest.TestCase):
"""
See: https://github.com/python/cpython/issues/107396
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix ``tarfile.TarFile.zstopen`` to close the underlying zstd file object
when opening the tar archive is interrupted by a :exc:`BaseException`
subclass such as :exc:`KeyboardInterrupt`.
Loading