mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
merge heads
This commit is contained in:
commit
2d6a58b96f
2 changed files with 3 additions and 2 deletions
|
@ -2153,10 +2153,10 @@ class TarFile(object):
|
|||
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
|
||||
|
|
|
@ -462,6 +462,7 @@ Stefan Franke
|
|||
Martin Franklin
|
||||
Kent Frazier
|
||||
Bruce Frederiksen
|
||||
Jason Fried
|
||||
Robin Friedrich
|
||||
Bradley Froehle
|
||||
Ivan Frohne
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue