mirror of https://github.com/python/cpython
bpo-8978: improve tarfile.open error message when lzma / bz2 are missing (GH-24850)
Automerge-Triggered-By: GH:pablogsal
This commit is contained in:
parent
8a37463989
commit
9aea31dedd
|
@ -1604,17 +1604,20 @@ class TarFile(object):
|
|||
# Find out which *open() is appropriate for opening the file.
|
||||
def not_compressed(comptype):
|
||||
return cls.OPEN_METH[comptype] == 'taropen'
|
||||
error_msgs = []
|
||||
for comptype in sorted(cls.OPEN_METH, key=not_compressed):
|
||||
func = getattr(cls, cls.OPEN_METH[comptype])
|
||||
if fileobj is not None:
|
||||
saved_pos = fileobj.tell()
|
||||
try:
|
||||
return func(name, "r", fileobj, **kwargs)
|
||||
except (ReadError, CompressionError):
|
||||
except (ReadError, CompressionError) as e:
|
||||
error_msgs.append(f'- method {comptype}: {e!r}')
|
||||
if fileobj is not None:
|
||||
fileobj.seek(saved_pos)
|
||||
continue
|
||||
raise ReadError("file could not be opened successfully")
|
||||
error_msgs_summary = '\n'.join(error_msgs)
|
||||
raise ReadError(f"file could not be opened successfully:\n{error_msgs_summary}")
|
||||
|
||||
elif ":" in mode:
|
||||
filemode, comptype = mode.split(":", 1)
|
||||
|
|
|
@ -2283,6 +2283,18 @@ class MiscTest(unittest.TestCase):
|
|||
'SubsequentHeaderError', 'ExFileObject', 'main'}
|
||||
support.check__all__(self, tarfile, not_exported=not_exported)
|
||||
|
||||
def test_useful_error_message_when_modules_missing(self):
|
||||
fname = os.path.join(os.path.dirname(__file__), 'testtar.tar.xz')
|
||||
with self.assertRaises(tarfile.ReadError) as excinfo:
|
||||
error = tarfile.CompressionError('lzma module is not available'),
|
||||
with unittest.mock.patch.object(tarfile.TarFile, 'xzopen', side_effect=error):
|
||||
tarfile.open(fname)
|
||||
|
||||
self.assertIn(
|
||||
"\n- method xz: CompressionError('lzma module is not available')\n",
|
||||
str(excinfo.exception),
|
||||
)
|
||||
|
||||
|
||||
class CommandLineTest(unittest.TestCase):
|
||||
|
||||
|
|
Binary file not shown.
|
@ -0,0 +1,2 @@
|
|||
Improve error message for :func:`tarfile.open` when :mod:`lzma` / :mod:`bz2`
|
||||
are unavailable. Patch by Anthony Sottile.
|
Loading…
Reference in New Issue