[Python-checkins] cpython (merge default -> default): merge heads

[gregory.p.smith]

https://hg.python.org/cpython/rev/c3d193566986
changeset:   101904:c3d193566986
parent:      101903:13ea0a1d7dde
parent:      101902:a4f918de25e5
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Jun 11 17:56:40 2016 -0700
summary:
  merge heads

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