diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 87500c726ce9a8..149d807ae0a776 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -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 diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 02fd9620bcf33d..d730cfec2ff298 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -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 diff --git a/Misc/NEWS.d/next/Library/2026-05-19-18-25-00.gh-issue-150077.zstopen-close.rst b/Misc/NEWS.d/next/Library/2026-05-19-18-25-00.gh-issue-150077.zstopen-close.rst new file mode 100644 index 00000000000000..06d20e41e25037 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-05-19-18-25-00.gh-issue-150077.zstopen-close.rst @@ -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`.