(original) (raw)

--- Lib\gzip_old.py Thu Aug 03 09:27:30 2006 +++ Lib\gzip.py Mon Dec 29 23:44:54 2008 @@ -5,7 +5,7 @@ but random access is not allowed.""" # based on Andrew Kuchling's minigzip.py distributed with the zlib module -import struct, sys, time +import os.path, struct, sys, time import zlib import __builtin__ @@ -100,19 +100,23 @@ class GzipFile: if hasattr(fileobj, 'mode'): mode = fileobj.mode else: mode = 'rb' + # basename of the original filename for file header (RFC 1952) + self.name = os.path.basename(filename) + if self.name.endswith(".gz"): + self.name = self.name[:-3] + if mode[0:1] == 'r': self.mode = READ # Set flag indicating start of a new member self._new_member = True self.extrabuf = "" self.extrasize = 0 - self.filename = filename # Starts small, scales exponentially self.min_readsize = 100 elif mode[0:1] == 'w' or mode[0:1] == 'a': self.mode = WRITE - self._init_write(filename) + self._init_write() self.compress = zlib.compressobj(compresslevel, zlib.DEFLATED, -zlib.MAX_WBITS, @@ -131,10 +135,7 @@ class GzipFile: s = repr(self.fileobj) return '