diff options
author | Lars Gustäbel <lars@gustaebel.de> | 2006-12-27 10:30:46 +0000 |
---|---|---|
committer | Lars Gustäbel <lars@gustaebel.de> | 2006-12-27 10:30:46 +0000 |
commit | a7ba6fc548d1d38e163aaa9ab5d9405e412ec62a (patch) | |
tree | 8d64ca20250b4cde9161956a57ce2d1b7d02dd1b /Lib/tarfile.py | |
parent | 71662323992907f1da51ea61a6f29b09e571c089 (diff) | |
download | cpython-git-a7ba6fc548d1d38e163aaa9ab5d9405e412ec62a.tar.gz |
Patch #1504073: Fix tarfile.open() for mode "r" with a fileobj argument.
Will backport to 2.5.
Diffstat (limited to 'Lib/tarfile.py')
-rw-r--r-- | Lib/tarfile.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 658f2144bf..178514470e 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -1141,9 +1141,13 @@ class TarFile(object): # Find out which *open() is appropriate for opening the file. for comptype in cls.OPEN_METH: func = getattr(cls, cls.OPEN_METH[comptype]) + if fileobj is not None: + saved_pos = fileobj.tell() try: return func(name, "r", fileobj) except (ReadError, CompressionError): + if fileobj is not None: + fileobj.seek(saved_pos) continue raise ReadError("file could not be opened successfully") |