Fix #11513: wrong exception handling for the case that GzipFile itself raises an IOError.
This commit is contained in:
parent
963e40256a
commit
3abb372c81
|
@ -1804,11 +1804,13 @@ class TarFile(object):
|
|||
fileobj = gzip.GzipFile(name, mode + "b", compresslevel, fileobj)
|
||||
t = cls.taropen(name, mode, fileobj, **kwargs)
|
||||
except IOError:
|
||||
if not extfileobj:
|
||||
if not extfileobj and fileobj is not None:
|
||||
fileobj.close()
|
||||
if fileobj is None:
|
||||
raise
|
||||
raise ReadError("not a gzip file")
|
||||
except:
|
||||
if not extfileobj:
|
||||
if not extfileobj and fileobj is not None:
|
||||
fileobj.close()
|
||||
raise
|
||||
t._extfileobj = extfileobj
|
||||
|
|
|
@ -1682,6 +1682,14 @@ class LinkEmulationTest(ReadTest):
|
|||
class GzipMiscReadTest(MiscReadTest):
|
||||
tarname = gzipname
|
||||
mode = "r:gz"
|
||||
|
||||
def test_non_existent_targz_file(self):
|
||||
# Test for issue11513: prevent non-existent gzipped tarfiles raising
|
||||
# multiple exceptions.
|
||||
with self.assertRaisesRegex(IOError, "xxx") as ex:
|
||||
tarfile.open("xxx", self.mode)
|
||||
self.assertEqual(ex.exception.errno, errno.ENOENT)
|
||||
|
||||
class GzipUstarReadTest(UstarReadTest):
|
||||
tarname = gzipname
|
||||
mode = "r:gz"
|
||||
|
|
Loading…
Reference in New Issue