summaryrefslogtreecommitdiffstats
path: root/Lib/tarfile.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-10-30 18:52:29 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-10-30 18:52:29 (GMT)
commita89d22aff3fb1e67f8f08eac22b08a58dfa048a8 (patch)
tree2324a9b41897d39e8b10e28f39a60ee5186c27fe /Lib/tarfile.py
parentd1af5effc214f474bcb1df62eb2089c48f657ee5 (diff)
downloadcpython-a89d22aff3fb1e67f8f08eac22b08a58dfa048a8.zip
cpython-a89d22aff3fb1e67f8f08eac22b08a58dfa048a8.tar.gz
cpython-a89d22aff3fb1e67f8f08eac22b08a58dfa048a8.tar.bz2
Issue #28449: tarfile.open() with mode "r" or "r:" now tries to open a tar
file with compression before trying to open it without compression. Otherwise it had 50% chance failed with ignore_zeros=True.
Diffstat (limited to 'Lib/tarfile.py')
-rwxr-xr-xLib/tarfile.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 721f9d7..999a99b 100755
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1549,7 +1549,9 @@ class TarFile(object):
if mode in ("r", "r:*"):
# Find out which *open() is appropriate for opening the file.
- for comptype in cls.OPEN_METH:
+ def not_compressed(comptype):
+ return cls.OPEN_METH[comptype] == 'taropen'
+ 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()