From c8f71c5a6dc758118c12227fdf2ebe8e2d990e7b Mon Sep 17 00:00:00 2001 From: lee Date: Tue, 19 May 2026 19:11:06 +0800 Subject: [PATCH 1/2] fix tarfile: zstopen uses except Exception --- Lib/tarfile.py | 2 +- Lib/test/test_tarfile.py | 15 +++++++++++++++ ...-19-18-25-00.gh-issue-150077.zstopen-close.rst | 2 ++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2026-05-19-18-25-00.gh-issue-150077.zstopen-close.rst 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..cf659d4370ec17 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -1065,6 +1065,21 @@ 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): + fileobj = unittest.mock.Mock() + with unittest.mock.patch("compression.zstd.ZstdFile", + return_value=fileobj), \ + unittest.mock.patch.object(tarfile.TarFile, "taropen", + side_effect=KeyboardInterrupt): + with self.assertRaises(KeyboardInterrupt): + tarfile.TarFile.zstopen("foo.tar.zst") + fileobj.close.assert_called_once() + 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..3d948dba679173 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-05-19-18-25-00.gh-issue-150077.zstopen-close.rst @@ -0,0 +1,2 @@ +Fix :meth:`tarfile.TarFile.zstopen` to close the zstd file object when +opening the tar archive fails with a :exc:`BaseException`. From 034ded165b8547547362022f1e32ecb90aea24d7 Mon Sep 17 00:00:00 2001 From: lee Date: Tue, 19 May 2026 20:13:41 +0800 Subject: [PATCH 2/2] Fix NEWS entry --- .../2026-05-19-18-25-00.gh-issue-150077.zstopen-close.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 index 3d948dba679173..ffcc6db30ebd78 100644 --- 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 @@ -1,2 +1,4 @@ -Fix :meth:`tarfile.TarFile.zstopen` to close the zstd file object when -opening the tar archive fails with a :exc:`BaseException`. +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`. +