mirror of
https://github.com/python/cpython.git
synced 2025-10-10 00:43:41 +00:00
Issue #20243: TarFile no longer raise ReadError when opened in write mode.
This commit is contained in:
parent
9fbec7ad5e
commit
c2d01423e0
3 changed files with 36 additions and 11 deletions
|
@ -1628,19 +1628,22 @@ class TarFile(object):
|
||||||
except (ImportError, AttributeError):
|
except (ImportError, AttributeError):
|
||||||
raise CompressionError("gzip module is not available")
|
raise CompressionError("gzip module is not available")
|
||||||
|
|
||||||
extfileobj = fileobj is not None
|
|
||||||
try:
|
try:
|
||||||
fileobj = gzip.GzipFile(name, mode + "b", compresslevel, fileobj)
|
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)
|
t = cls.taropen(name, mode, fileobj, **kwargs)
|
||||||
except IOError:
|
except OSError:
|
||||||
if not extfileobj and fileobj is not None:
|
fileobj.close()
|
||||||
fileobj.close()
|
if mode == 'r':
|
||||||
if fileobj is None:
|
raise ReadError("not a gzip file")
|
||||||
raise
|
raise
|
||||||
raise ReadError("not a gzip file")
|
|
||||||
except:
|
except:
|
||||||
if not extfileobj and fileobj is not None:
|
fileobj.close()
|
||||||
fileobj.close()
|
|
||||||
raise
|
raise
|
||||||
t._extfileobj = False
|
t._extfileobj = False
|
||||||
return t
|
return t
|
||||||
|
@ -1665,7 +1668,9 @@ class TarFile(object):
|
||||||
t = cls.taropen(name, mode, fileobj, **kwargs)
|
t = cls.taropen(name, mode, fileobj, **kwargs)
|
||||||
except (IOError, EOFError):
|
except (IOError, EOFError):
|
||||||
fileobj.close()
|
fileobj.close()
|
||||||
raise ReadError("not a bzip2 file")
|
if mode == 'r':
|
||||||
|
raise ReadError("not a bzip2 file")
|
||||||
|
raise
|
||||||
t._extfileobj = False
|
t._extfileobj = False
|
||||||
return t
|
return t
|
||||||
|
|
||||||
|
@ -1688,7 +1693,9 @@ class TarFile(object):
|
||||||
t = cls.taropen(name, mode, fileobj, **kwargs)
|
t = cls.taropen(name, mode, fileobj, **kwargs)
|
||||||
except (lzma.LZMAError, EOFError):
|
except (lzma.LZMAError, EOFError):
|
||||||
fileobj.close()
|
fileobj.close()
|
||||||
raise ReadError("not an lzma file")
|
if mode == 'r':
|
||||||
|
raise ReadError("not an lzma file")
|
||||||
|
raise
|
||||||
t._extfileobj = False
|
t._extfileobj = False
|
||||||
return t
|
return t
|
||||||
|
|
||||||
|
|
|
@ -1155,6 +1155,22 @@ class WriteTest(WriteTestBase, unittest.TestCase):
|
||||||
finally:
|
finally:
|
||||||
os.chdir(cwd)
|
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):
|
class GzipWriteTest(GzipTest, WriteTest):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,8 @@ Core and Builtins
|
||||||
Library
|
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
|
- Issue #20238: TarFile opened with external fileobj and "w:gz" mode didn't
|
||||||
write complete output on close.
|
write complete output on close.
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue