Merge: #13781: Fix GzipFile to work with os.fdopen()'d file objects.

This commit is contained in:
Nadeem Vawda 2012-01-18 09:32:25 +02:00
commit 50a4d5debb
3 changed files with 15 additions and 2 deletions

View File

@ -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'

View File

@ -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):

View File

@ -447,6 +447,9 @@ Core and Builtins
Library
-------
- Issue #13781: Fix GzipFile bug that caused an exception to be raised when
opening for writing using a fileobj returned by os.fdopen().
- Issue #13803: Under Solaris, distutils doesn't include bitness
in the directory name.