traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #16477: Close tarfile internal handlers in case of exception. 

Patch by Serhiy Storchaka.
This commit is contained in:
Andrew Svetlov 2012-11-29 14:20:47 +02:00
parent 4927633ab6
commit 718df1d638
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Lib/tarfile.py
View File

@ -2077,9 +2077,8 @@ class TarFile(object):
# Append the tar header and data to the archive. # Append the tar header and data to the archive.
if tarinfo.isreg(): if tarinfo.isreg():
f = bltn_open(name, "rb") with bltn_open(name, "rb") as f:
self.addfile(tarinfo, f) self.addfile(tarinfo, f)
f.close()
elif tarinfo.isdir(): elif tarinfo.isdir():
self.addfile(tarinfo) self.addfile(tarinfo)
@ -2292,16 +2291,15 @@ class TarFile(object):
""" """
source = self.fileobj source = self.fileobj
source.seek(tarinfo.offset_data) source.seek(tarinfo.offset_data)
target = bltn_open(targetpath, "wb") with bltn_open(targetpath, "wb") as target:
if tarinfo.sparse is not None: if tarinfo.sparse is not None:
for offset, size in tarinfo.sparse: for offset, size in tarinfo.sparse:
target.seek(offset) target.seek(offset)
copyfileobj(source, target, size) copyfileobj(source, target, size)
else: else:
copyfileobj(source, target, tarinfo.size) copyfileobj(source, target, tarinfo.size)
target.seek(tarinfo.size) target.seek(tarinfo.size)
target.truncate() target.truncate()
target.close()
def makeunknown(self, tarinfo, targetpath): def makeunknown(self, tarinfo, targetpath):
"""Make a file from a TarInfo object with an unknown type """Make a file from a TarInfo object with an unknown type