mirror of
https://github.com/python/cpython.git
synced 2026-01-06 23:42:34 +00:00
Issue #20243: TarFile no longer raise ReadError when opened in write mode.
This commit is contained in:
commit
aee0e63ed0
3 changed files with 35 additions and 10 deletions
|
|
@ -1604,19 +1604,22 @@ def gzopen(cls, name, mode="r", fileobj=None, compresslevel=9, **kwargs):
|
|||
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 OSError:
|
||||
if not extfileobj and fileobj is not None:
|
||||
fileobj.close()
|
||||
if fileobj is None:
|
||||
raise
|
||||
raise ReadError("not a gzip file")
|
||||
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
|
||||
|
|
@ -1641,7 +1644,9 @@ def bz2open(cls, name, mode="r", fileobj=None, compresslevel=9, **kwargs):
|
|||
t = cls.taropen(name, mode, fileobj, **kwargs)
|
||||
except (OSError, EOFError):
|
||||
fileobj.close()
|
||||
raise ReadError("not a bzip2 file")
|
||||
if mode == 'r':
|
||||
raise ReadError("not a bzip2 file")
|
||||
raise
|
||||
t._extfileobj = False
|
||||
return t
|
||||
|
||||
|
|
@ -1664,7 +1669,9 @@ def xzopen(cls, name, mode="r", fileobj=None, preset=None, **kwargs):
|
|||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -1157,6 +1157,22 @@ def test_cwd(self):
|
|||
finally:
|
||||
os.chdir(cwd)
|
||||
|
||||
def test_open_nonwritable_fileobj(self):
|
||||
for exctype in OSError, EOFError, RuntimeError:
|
||||
class BadFile(io.BytesIO):
|
||||
first = True
|
||||
def write(self, data):
|
||||
if self.first:
|
||||
self.first = False
|
||||
raise exctype
|
||||
|
||||
f = BadFile()
|
||||
with self.assertRaises(exctype):
|
||||
tar = tarfile.open(tmpname, self.mode, fileobj=f,
|
||||
format=tarfile.PAX_FORMAT,
|
||||
pax_headers={'non': 'empty'})
|
||||
self.assertFalse(f.closed)
|
||||
|
||||
class GzipWriteTest(GzipTest, WriteTest):
|
||||
pass
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #20243: TarFile no longer raise ReadError when opened in write mode.
|
||||
|
||||
- Issue #20238: TarFile opened with external fileobj and "w:gz" mode didn't
|
||||
write complete output on close.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue