Merge: #13781: Fix GzipFile to work with os.fdopen()'d file objects.
This commit is contained in:
commit
50a4d5debb
|
@ -144,8 +144,10 @@ class GzipFile(io.BufferedIOBase):
|
|||
if fileobj is None:
|
||||
fileobj = self.myfileobj = builtins.open(filename, mode or 'rb')
|
||||
if filename is None:
|
||||
if hasattr(fileobj, 'name'): filename = fileobj.name
|
||||
else: filename = ''
|
||||
if hasattr(fileobj, 'name') and isinstance(fileobj.name, str):
|
||||
filename = fileobj.name
|
||||
else:
|
||||
filename = ''
|
||||
if mode is None:
|
||||
if hasattr(fileobj, 'mode'): mode = fileobj.mode
|
||||
else: mode = 'rb'
|
||||
|
|
|
@ -346,6 +346,14 @@ class TestGzip(unittest.TestCase):
|
|||
with io.TextIOWrapper(f, encoding="ascii") as t:
|
||||
self.assertEqual(t.readlines(), lines)
|
||||
|
||||
def test_fileobj_from_fdopen(self):
|
||||
# Issue #13781: Opening a GzipFile for writing fails when using a
|
||||
# fileobj created with os.fdopen().
|
||||
fd = os.open(self.filename, os.O_WRONLY | os.O_CREAT)
|
||||
with os.fdopen(fd, "wb") as f:
|
||||
with gzip.GzipFile(fileobj=f, mode="w") as g:
|
||||
pass
|
||||
|
||||
# Testing compress/decompress shortcut functions
|
||||
|
||||
def test_compress(self):
|
||||
|
|
Loading…
Reference in New Issue