mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 08:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #20243: TarFile no longer raise ReadError when opened in write mode.

Browse source
This commit is contained in:
Serhiy Storchaka 2014-01-18 16:14:10 +02:00
parent 9fbec7ad5e
commit c2d01423e0
3 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Lib/tarfile.py
View file

@ -1628,19 +1628,22 @@ class TarFile(object):
except (ImportError, AttributeError):
raise CompressionError("gzip module is not available")
extfileobj = fileobj is not None
try:
fileobj = gzip.GzipFile(name, mode + "b", compresslevel, fileobj)
except OSError:
if fileobj is not None and mode == 'r':
raise ReadError("not a gzip file")
raise
try:
t = cls.taropen(name, mode, fileobj, **kwargs)
except IOError:
if not extfileobj and fileobj is not None:
fileobj.close()
if fileobj is None:
raise
raise ReadError("not a gzip file")
except OSError:
fileobj.close()
if mode == 'r':
raise ReadError("not a gzip file")
raise
except:
if not extfileobj and fileobj is not None:
fileobj.close()
fileobj.close()
raise
t._extfileobj = False
return t
@ -1665,7 +1668,9 @@ class TarFile(object):
t = cls.taropen(name, mode, fileobj, **kwargs)
except (IOError, EOFError):
fileobj.close()
raise ReadError("not a bzip2 file")
if mode == 'r':
raise ReadError("not a bzip2 file")
raise
t._extfileobj = False
return t
@ -1688,7 +1693,9 @@ class TarFile(object):
t = cls.taropen(name, mode, fileobj, **kwargs)
except (lzma.LZMAError, EOFError):
fileobj.close()
raise ReadError("not an lzma file")
if mode == 'r':
raise ReadError("not an lzma file")
raise
t._extfileobj = False
return t