[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5, issue #27194

Sat Jun 11 19:59:29 EDT 2016

https://hg.python.org/cpython/rev/a4f918de25e5
changeset: 101902:a4f918de25e5
parent: 101896:27b0dbaf0ea8
parent: 101901:b63474aa8a5f
user: Łukasz Langa <lukasz at langa.pl>
date: Sat Jun 11 16:56:18 2016 -0700
summary:
 Merge 3.5, issue #27194
files:
 Lib/tarfile.py | 4 ++--
 Misc/ACKS | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -2153,10 +2153,10 @@
 for offset, size in tarinfo.sparse:
 target.seek(offset)
 copyfileobj(source, target, size, ReadError)
+ target.seek(tarinfo.size)
+ target.truncate()
 else:
 copyfileobj(source, target, tarinfo.size, ReadError)
- target.seek(tarinfo.size)
- target.truncate()
 
 def makeunknown(self, tarinfo, targetpath):
 """Make a file from a TarInfo object with an unknown type
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -462,6 +462,7 @@
 Martin Franklin
 Kent Frazier
 Bruce Frederiksen
+Jason Fried
 Robin Friedrich
 Bradley Froehle
 Ivan Frohne
-- 
Repository URL: https://hg.python.org/cpython
