Fix GzipFile's handling of filenames given as bytes objects.

diff --git a/Lib/gzip.py b/Lib/gzip.py
index 1de23b6972f203c954c712da504d757838adfc58..ee45e50ffbae3fc8f0b3bd56f662cd6467696352 100644 (file)
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -159,9 +159,8 @@ 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') and isinstance(fileobj.name, str):
-                filename = fileobj.name
-            else:
+            filename = getattr(fileobj, 'name', '')
+            if not isinstance(filename, (str, bytes)):
                 filename = ''
         if mode is None:
             if hasattr(fileobj, 'mode'): mode = fileobj.mode
@@ -236,7 +235,8 @@ class GzipFile(io.BufferedIOBase):
             # RFC 1952 requires the FNAME field to be Latin-1. Do not
             # include filenames that cannot be represented that way.
             fname = os.path.basename(self.name)
-            fname = fname.encode('latin-1')
+            if not isinstance(fname, bytes):
+                fname = fname.encode('latin-1')
             if fname.endswith(b'.gz'):
                 fname = fname[:-3]
         except UnicodeEncodeError:

diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py
index 5ae7467e669b6ed0aafb07d32505771ce4fe1b58..ced226f3dce3b6cd27c9db4e8205e56c24e4734e 100644 (file)
--- a/Lib/test/test_gzip.py
+++ b/Lib/test/test_gzip.py
@@ -331,6 +331,20 @@ class TestGzip(unittest.TestCase):
             with gzip.GzipFile(fileobj=f, mode="w") as g:
                 pass
 
+    def test_bytes_filename(self):
+        str_filename = self.filename
+        try:
+            bytes_filename = str_filename.encode("ascii")
+        except UnicodeEncodeError:
+            self.skipTest("Temporary file name needs to be ASCII")
+        with gzip.GzipFile(bytes_filename, "wb") as f:
+            f.write(data1 * 50)
+        with gzip.GzipFile(bytes_filename, "rb") as f:
+            self.assertEqual(f.read(), data1 * 50)
+        # Sanity check that we are actually operating on the right file.
+        with gzip.GzipFile(str_filename, "rb") as f:
+            self.assertEqual(f.read(), data1 * 50)
+
     # Testing compress/decompress shortcut functions
 
     def test_compress(self):

diff --git a/Misc/NEWS b/Misc/NEWS
index 5c1e81ae6309b80fbdf212a99cfeacc0c7aedc9e..330e51a53a9197987cb420320b5008c1236b468b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -70,6 +70,8 @@ Core and Builtins
 Library
 -------
 
+- Fix GzipFile's handling of filenames given as bytes objects.
+
 - Issue #15101: Make pool finalizer avoid joining current thread.
 
 - Issue #15036: Mailbox no longer throws an error if a flush is done