From 103e8113e4bb4ad3687d641f660481c72904d571 Mon Sep 17 00:00:00 2001 From: Nadeem Vawda Date: Wed, 20 Jun 2012 01:35:22 +0200 Subject: Fix GzipFile's handling of filenames given as bytes objects. --- Lib/gzip.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Lib/gzip.py') diff --git a/Lib/gzip.py b/Lib/gzip.py index 1de23b6972f..ee45e50ffba 100644 --- 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: -- cgit v1.2.3