[Python-checkins] cpython (2.7): Issue #28449: tarfile.open() with mode "r" or "r:" now tries to open a tar
serhiy.storchaka
python-checkins at python.org
Sun Oct 30 14:59:04 EDT 2016
https://hg.python.org/cpython/rev/e2dd0f48e643
changeset: 104832:e2dd0f48e643
branch: 2.7
parent: 104816:cf91d48aa353
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Oct 30 20:52:55 2016 +0200
summary:
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.
files:
Lib/tarfile.py | 4 +++-
Lib/test/test_tarfile.py | 9 ++++++++-
Misc/NEWS | 4 ++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1665,7 +1665,9 @@
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()
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -2,7 +2,9 @@
import os
import shutil
import StringIO
+from binascii import unhexlify
from hashlib import md5
+from random import Random
import errno
import unittest
@@ -276,12 +278,17 @@
else:
_open = open
+ # generate 512 pseudorandom bytes
+ data = unhexlify('%1024x' % Random(0).getrandbits(512*8))
for char in ('\0', 'a'):
# Test if EOFHeaderError ('\0') and InvalidHeaderError ('a')
# are ignored correctly.
with _open(tmpname, "wb") as fobj:
fobj.write(char * 1024)
- fobj.write(tarfile.TarInfo("foo").tobuf())
+ tarinfo = tarfile.TarInfo("foo")
+ tarinfo.size = len(data)
+ fobj.write(tarinfo.tobuf())
+ fobj.write(data)
tar = tarfile.open(tmpname, mode="r", ignore_zeros=True)
try:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,6 +60,10 @@
Library
-------
+- 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.
+
- Issue #25464: Fixed HList.header_exists() in Tix module by adding
a workaround to Tix library bug.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list