]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-8978: improve tarfile.open error message when lzma / bz2 are missing (GH-24850)
authorAnthony Sottile <asottile@umich.edu>
Tue, 27 Apr 2021 17:39:01 +0000 (10:39 -0700)
committerGitHub <noreply@github.com>
Tue, 27 Apr 2021 17:39:01 +0000 (10:39 -0700)
Automerge-Triggered-By: GH:pablogsal
Lib/tarfile.py
Lib/test/test_tarfile.py
Lib/test/testtar.tar.xz [new file with mode: 0644]
Misc/NEWS.d/next/Library/2021-03-13-14-02-07.bpo-8978.CRxG-O.rst [new file with mode: 0644]

index 395c0f1d30040d02b787101028a3da4502de75f0..18d415adf5441847c72ae8916ecd6ff6ff5e8ef8 100755 (executable)
@@ -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)
index 77ad8305c3107aa383d1aecfeb244575f4a69124..817e6f17997121520657608c33e6d217d64904b2 100644 (file)
@@ -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):
 
diff --git a/Lib/test/testtar.tar.xz b/Lib/test/testtar.tar.xz
new file mode 100644 (file)
index 0000000..512fa14
Binary files /dev/null and b/Lib/test/testtar.tar.xz differ
diff --git a/Misc/NEWS.d/next/Library/2021-03-13-14-02-07.bpo-8978.CRxG-O.rst b/Misc/NEWS.d/next/Library/2021-03-13-14-02-07.bpo-8978.CRxG-O.rst
new file mode 100644 (file)
index 0000000..2da8874
--- /dev/null
@@ -0,0 +1,2 @@
+Improve error message for :func:`tarfile.open` when :mod:`lzma` / :mod:`bz2`
+are unavailable.  Patch by Anthony Sottile.