summaryrefslogtreecommitdiff
path: root/Lib/tarfile.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-10-30 20:56:23 +0200
committerSerhiy Storchaka <storchaka@gmail.com>2016-10-30 20:56:23 +0200
commit2f4453eff8296e6b5e57c237d47288d9a9842b00 (patch)
tree01394f25acffe7bc0a46055a5cd6fa65811c71df /Lib/tarfile.py
parent7984bff52a9952219a3c15b88ff6514244dd7498 (diff)
parenta89d22aff3fb1e67f8f08eac22b08a58dfa048a8 (diff)
downloadcpython-git-2f4453eff8296e6b5e57c237d47288d9a9842b00.tar.gz
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 a62ab82545..b78b1b1f4b 100755
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1554,7 +1554,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()