(original) (raw)

changeset: 88550:40a5c7547c3d parent: 88546:e154b93f3857 parent: 88549:2f3b47b63f91 user: Serhiy Storchaka storchaka@gmail.com date: Sat Jan 18 16:14:49 2014 +0200 files: Lib/tarfile.py Lib/test/test_tarfile.py Misc/NEWS description: Issue #20243: TarFile no longer raise ReadError when opened in write mode. diff -r e154b93f3857 -r 40a5c7547c3d Lib/tarfile.py --- a/Lib/tarfile.py Sat Jan 18 15:53:39 2014 +0200 +++ b/Lib/tarfile.py Sat Jan 18 16:14:49 2014 +0200 @@ -1604,19 +1604,22 @@ 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 @@ 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 @@ 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 diff -r e154b93f3857 -r 40a5c7547c3d Lib/test/test_tarfile.py --- a/Lib/test/test_tarfile.py Sat Jan 18 15:53:39 2014 +0200 +++ b/Lib/test/test_tarfile.py Sat Jan 18 16:14:49 2014 +0200 @@ -1157,6 +1157,22 @@ 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 diff -r e154b93f3857 -r 40a5c7547c3d Misc/NEWS --- a/Misc/NEWS Sat Jan 18 15:53:39 2014 +0200 +++ b/Misc/NEWS Sat Jan 18 16:14:49 2014 +0200 @@ -25,6 +25,8 @@ 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. /storchaka@gmail.com