Retouch my last change after a comment on style from Guido.

This commit is contained in:
Lars Gustäbel 2007-08-13 09:05:16 +00:00
parent 0f98d8f8ea
commit ead70565fc
1 changed files with 7 additions and 10 deletions

View File

@ -149,18 +149,15 @@ class GzipFile:
def _write_gzip_header(self): def _write_gzip_header(self):
self.fileobj.write(b'\037\213') # magic header self.fileobj.write(b'\037\213') # magic header
self.fileobj.write(b'\010') # compression method self.fileobj.write(b'\010') # compression method
fname = self.name
if fname.endswith(".gz"):
fname = fname[:-3]
flags = 0
# RFC 1952 requires the FNAME field to be Latin-1. Do not
# include filenames that cannot be represented that way.
try: try:
fname = fname.encode('latin-1') # RFC 1952 requires the FNAME field to be Latin-1. Do not
# include filenames that cannot be represented that way.
fname = self.name.encode('latin-1')
if fname.endswith(b'.gz'):
fname = fname[:-3]
except UnicodeEncodeError: except UnicodeEncodeError:
fname = '' fname = b''
flags = 0
if fname: if fname:
flags = FNAME flags = FNAME
self.fileobj.write(chr(flags).encode('latin-1')) self.fileobj.write(chr(flags).encode('latin-1'))