From 718df1d6384da5285e5c2e5cab6584bf10350513 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Thu, 29 Nov 2012 14:20:47 +0200 Subject: [PATCH] Issue #16477: Close tarfile internal handlers in case of exception. Patch by Serhiy Storchaka. --- Lib/tarfile.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Lib/tarfile.py b/Lib/tarfile.py index f26953e2bb1..54d0e0e173f 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -2077,9 +2077,8 @@ class TarFile(object): # Append the tar header and data to the archive. if tarinfo.isreg(): - f = bltn_open(name, "rb") - self.addfile(tarinfo, f) - f.close() + with bltn_open(name, "rb") as f: + self.addfile(tarinfo, f) elif tarinfo.isdir(): self.addfile(tarinfo) @@ -2292,16 +2291,15 @@ class TarFile(object): """ source = self.fileobj source.seek(tarinfo.offset_data) - target = bltn_open(targetpath, "wb") - if tarinfo.sparse is not None: - for offset, size in tarinfo.sparse: - target.seek(offset) - copyfileobj(source, target, size) - else: - copyfileobj(source, target, tarinfo.size) - target.seek(tarinfo.size) - target.truncate() - target.close() + with bltn_open(targetpath, "wb") as target: + if tarinfo.sparse is not None: + for offset, size in tarinfo.sparse: + target.seek(offset) + copyfileobj(source, target, size) + else: + copyfileobj(source, target, tarinfo.size) + target.seek(tarinfo.size) + target.truncate() def makeunknown(self, tarinfo, targetpath): """Make a file from a TarInfo object with an unknown type