Commit 7a278da4 authored by Serhiy Storchaka's avatar Serhiy Storchaka

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

parent cdf1ebd8
......@@ -1726,7 +1726,9 @@ class TarFile(object):
gzip.GzipFile(name, mode, compresslevel, fileobj),
**kwargs)
except IOError:
raise ReadError("not a gzip file")
if mode == 'r':
raise ReadError("not a gzip file")
raise
t._extfileobj = False
return t
......@@ -1751,7 +1753,9 @@ class TarFile(object):
try:
t = cls.taropen(name, mode, fileobj, **kwargs)
except (IOError, EOFError):
raise ReadError("not a bzip2 file")
if mode == 'r':
raise ReadError("not a bzip2 file")
raise
t._extfileobj = False
return t
......
......@@ -979,6 +979,22 @@ class WriteTest(WriteTestBase):
os.unlink(temparchive)
shutil.rmtree(tempdir)
def test_open_nonwritable_fileobj(self):
for exctype in IOError, EOFError, RuntimeError:
class BadFile(StringIO.StringIO):
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 StreamWriteTest(WriteTestBase):
mode = "w|"
......
......@@ -35,6 +35,8 @@ Core and Builtins
Library
-------
- Issue #20243: TarFile no longer raise ReadError when opened in write mode.
- Issue #20245: The open functions in the tarfile module now correctly handle
empty mode.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment