Commit 927617c

committed

tarfile: Make it possible to extract nested tarfiles in memory

FileSection.skip() (see below the diff) uses 2-argument readinto, so attempting to recursively extract archives throws an error. This commit adds optional second argument to fix this problem. After this commit, it is possible to extract nested archives in roughly this fashion: with open(path, 'rb') as file: tar_outer = tarfile.TarFile(fileobj=file) for ti_outer in tar_outer: tar_inner = tarfile.TarFile( fileobj=tar_outer.extractfile(ti_outer)) for ti_inner in tar_inner: ... Nested archives are used in some embedded contexts, for example Mender artifacts. Signed-off-by: Wojciech Porczyk <wojciech.porczyk@connectpoint.pl>

1 parent f95568d commit 927617cCopy full SHA for 927617c

File tree

1 file changed

-1

lines changed

python-stdlib/tarfile/tarfile
- __init__.py

1 file changed

-1

lines changed

`‎python-stdlib/tarfile/tarfile/init.py‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,13 @@ def read(self, sz=65536):`
`41`	`41`	`self.content_len -= sz`
`42`	`42`	`return data`
`43`	`43`
`44`		`- def readinto(self, buf):`
	`44`	`+ def readinto(self, buf, size=None):`
`45`	`45`	`if self.content_len == 0:`
`46`	`46`	`return 0`
`47`	`47`	`if len(buf) > self.content_len:`
`48`	`48`	`buf = memoryview(buf)[: self.content_len]`
	`49`	`+ if size is not None and len(buf) > size:`
	`50`	`+ buf = memoryview(buf)[:size]`
`49`	`51`	`sz = self.f.readinto(buf)`
`50`	`52`	`self.content_len -= sz`
`51`	`53`	`return sz`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 927617c

File tree

1 file changed

1 file changed

`‎python-stdlib/tarfile/tarfile/init.py‎`

0 commit comments

File tree

1 file changed

1 file changed

‎python-stdlib/tarfile/tarfile/__init__.py‎

0 commit comments

`‎python-stdlib/tarfile/tarfile/init.py‎`