Issue #10233: Close file objects in a timely manner in the tarfile module
and its test suite.
This commit is contained in:
Antoine Pitrou
parent
749afa95ce
commit
e1eca4e3f5
|
|
@ -1800,20 +1800,18 @@ class TarFile(object):
|
|||
except (ImportError, AttributeError):
|
||||
raise CompressionError("gzip module is not available")
|
||||
|
||||
if fileobj is None:
|
||||
fileobj = bltn_open(name, mode + "b")
|
||||
extfileobj = False
|
||||
else:
|
||||
extfileobj = True
|
||||
|
||||
extfileobj = fileobj is not None
|
||||
try:
|
||||
t = cls.taropen(name, mode,
|
||||
gzip.GzipFile(name, mode, compresslevel, fileobj),
|
||||
**kwargs)
|
||||
fileobj = gzip.GzipFile(name, mode + "b", compresslevel, fileobj)
|
||||
t = cls.taropen(name, mode, fileobj, **kwargs)
|
||||
except IOError:
|
||||
if not extfileobj:
|
||||
fileobj.close()
|
||||
raise ReadError("not a gzip file")
|
||||
except:
|
||||
if not extfileobj:
|
||||
fileobj.close()
|
||||
raise
|
||||
t._extfileobj = extfileobj
|
||||
return t
|
||||
|
||||
|
|
|
|||
|
|
@ -52,17 +52,22 @@ class UstarReadTest(ReadTest):
|
|||
def test_fileobj_regular_file(self):
|
||||
tarinfo = self.tar.getmember("ustar/regtype")
|
||||
fobj = self.tar.extractfile(tarinfo)
|
||||
try:
|
||||
data = fobj.read()
|
||||
self.assertTrue((len(data), md5sum(data)) == (tarinfo.size, md5_regtype),
|
||||
"regular file extraction failed")
|
||||
finally:
|
||||
fobj.close()
|
||||
|
||||
def test_fileobj_readlines(self):
|
||||
self.tar.extract("ustar/regtype", TEMPDIR)
|
||||
tarinfo = self.tar.getmember("ustar/regtype")
|
||||
with open(os.path.join(TEMPDIR, "ustar/regtype"), "r") as fobj1:
|
||||
lines1 = fobj1.readlines()
|
||||
fobj2 = io.TextIOWrapper(self.tar.extractfile(tarinfo))
|
||||
|
||||
fobj = self.tar.extractfile(tarinfo)
|
||||
try:
|
||||
fobj2 = io.TextIOWrapper(fobj)
|
||||
lines2 = fobj2.readlines()
|
||||
self.assertTrue(lines1 == lines2,
|
||||
"fileobj.readlines() failed")
|
||||
|
|
@ -71,6 +76,8 @@ class UstarReadTest(ReadTest):
|
|||
self.assertTrue(lines2[83] ==
|
||||
"I will gladly admit that Python is not the fastest running scripting language.\n",
|
||||
"fileobj.readlines() failed")
|
||||
finally:
|
||||
fobj.close()
|
||||
|
||||
def test_fileobj_iter(self):
|
||||
self.tar.extract("ustar/regtype", TEMPDIR)
|
||||
|
|
@ -78,9 +85,12 @@ class UstarReadTest(ReadTest):
|
|||
with open(os.path.join(TEMPDIR, "ustar/regtype"), "rU") as fobj1:
|
||||
lines1 = fobj1.readlines()
|
||||
fobj2 = self.tar.extractfile(tarinfo)
|
||||
try:
|
||||
lines2 = list(io.TextIOWrapper(fobj2))
|
||||
self.assertTrue(lines1 == lines2,
|
||||
"fileobj.__iter__() failed")
|
||||
finally:
|
||||
fobj2.close()
|
||||
|
||||
def test_fileobj_seek(self):
|
||||
self.tar.extract("ustar/regtype", TEMPDIR)
|
||||
|
|
@ -138,7 +148,11 @@ class UstarReadTest(ReadTest):
|
|||
def _test_fileobj_link(self, lnktype, regtype):
|
||||
a = self.tar.extractfile(lnktype)
|
||||
b = self.tar.extractfile(regtype)
|
||||
try:
|
||||
self.assertEqual(a.name, b.name)
|
||||
finally:
|
||||
a.close()
|
||||
b.close()
|
||||
|
||||
def test_fileobj_link1(self):
|
||||
self._test_fileobj_link("ustar/lnktype", "ustar/regtype")
|
||||
|
|
@ -225,7 +239,7 @@ class MiscReadTest(CommonReadTest):
|
|||
data = fobj.read()
|
||||
fobj = io.BytesIO(data)
|
||||
fobj.name = ""
|
||||
tar = tarfile.open(fileobj=fobj, mode=self.mode)
|
||||
with tarfile.open(fileobj=fobj, mode=self.mode) as tar:
|
||||
self.assertEqual(tar.name, None)
|
||||
|
||||
def test_fileobj_with_offset(self):
|
||||
|
|
@ -237,7 +251,9 @@ class MiscReadTest(CommonReadTest):
|
|||
t = tar.next()
|
||||
name = t.name
|
||||
offset = t.offset
|
||||
data = tar.extractfile(t).read()
|
||||
f = tar.extractfile(t)
|
||||
data = f.read()
|
||||
f.close()
|
||||
finally:
|
||||
tar.close()
|
||||
|
||||
|
|
@ -319,7 +335,8 @@ class MiscReadTest(CommonReadTest):
|
|||
if e.errno == errno.ENOENT:
|
||||
self.fail("hardlink not extracted properly")
|
||||
|
||||
data = open(os.path.join(TEMPDIR, "ustar/lnktype"), "rb").read()
|
||||
with open(os.path.join(TEMPDIR, "ustar/lnktype"), "rb") as f:
|
||||
data = f.read()
|
||||
self.assertEqual(md5sum(data), md5_regtype)
|
||||
|
||||
try:
|
||||
|
|
@ -328,7 +345,8 @@ class MiscReadTest(CommonReadTest):
|
|||
if e.errno == errno.ENOENT:
|
||||
self.fail("symlink not extracted properly")
|
||||
|
||||
data = open(os.path.join(TEMPDIR, "ustar/symtype"), "rb").read()
|
||||
with open(os.path.join(TEMPDIR, "ustar/symtype"), "rb") as f:
|
||||
data = f.read()
|
||||
self.assertEqual(md5sum(data), md5_regtype)
|
||||
finally:
|
||||
tar.close()
|
||||
|
|
@ -604,7 +622,7 @@ class LongnameTest(ReadTest):
|
|||
# the preceding extended header.
|
||||
longname = self.subdir + "/" + "123/" * 125 + "longname"
|
||||
offset = self.tar.getmember(longname).offset
|
||||
fobj = open(tarname, "rb")
|
||||
with open(tarname, "rb") as fobj:
|
||||
fobj.seek(offset)
|
||||
tarinfo = tarfile.TarInfo.frombuf(fobj.read(512), "iso8859-1", "strict")
|
||||
self.assertEqual(tarinfo.type, self.longnametype)
|
||||
|
|
@ -1353,8 +1371,11 @@ class AppendTest(unittest.TestCase):
|
|||
t = src.getmember("ustar/regtype")
|
||||
t.name = "foo"
|
||||
f = src.extractfile(t)
|
||||
try:
|
||||
with tarfile.open(self.tarname, mode) as tar:
|
||||
tar.addfile(t, f)
|
||||
finally:
|
||||
f.close()
|
||||
|
||||
def _test(self, names=["bar"], fileobj=None):
|
||||
with tarfile.open(self.tarname, fileobj=fileobj) as tar:
|
||||
|
|
|
|||
|
|
@ -54,6 +54,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #10233: Close file objects in a timely manner in the tarfile module
|
||||
and its test suite.
|
||||
|
||||
- Issue #10093: ResourceWarnings are now issued when files and sockets are
|
||||
deallocated without explicit closing. These warnings are silenced by
|
||||
default, except in pydebug mode.
|
||||
|
|
|
|||
Loading…
Reference in New Issue