From 42db3efd368d154f428ce834ebc99fc8535931d7 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 4 Jan 2009 21:37:59 +0000 Subject: Merged revisions 68319 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r68319 | antoine.pitrou | 2009-01-04 22:29:23 +0100 (dim., 04 janv. 2009) | 3 lines Issue #4272: Add an optional argument to the GzipFile constructor to override the timestamp in the gzip stream. ........ --- Lib/gzip.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'Lib/gzip.py') diff --git a/Lib/gzip.py b/Lib/gzip.py index 11d557172f..560a722bae 100644 --- a/Lib/gzip.py +++ b/Lib/gzip.py @@ -54,7 +54,7 @@ class GzipFile: max_read_chunk = 10 * 1024 * 1024 # 10Mb def __init__(self, filename=None, mode=None, - compresslevel=9, fileobj=None): + compresslevel=9, fileobj=None, mtime=None): """Constructor for the GzipFile class. At least one of fileobj and filename must be given a @@ -81,6 +81,15 @@ class GzipFile: level of compression; 1 is fastest and produces the least compression, and 9 is slowest and produces the most compression. The default is 9. + The mtime argument is an optional numeric timestamp to be written + to the stream when compressing. All gzip compressed streams + are required to contain a timestamp. If omitted or None, the + current time is used. This module ignores the timestamp when + decompressing; however, some programs, such as gunzip, make use + of it. The format of the timestamp is the same as that of the + return value of time.time() and of the st_mtime member of the + object returned by os.stat(). + """ # guarantee the file is opened in binary mode on platforms @@ -119,6 +128,7 @@ class GzipFile: self.fileobj = fileobj self.offset = 0 + self.mtime = mtime if self.mode == WRITE: self._write_gzip_header() @@ -157,7 +167,10 @@ class GzipFile: if fname: flags = FNAME self.fileobj.write(chr(flags).encode('latin-1')) - write32u(self.fileobj, int(time.time())) + mtime = self.mtime + if mtime is None: + mtime = time.time() + write32u(self.fileobj, int(mtime)) self.fileobj.write(b'\002') self.fileobj.write(b'\377') if fname: @@ -175,10 +188,10 @@ class GzipFile: if method != 8: raise IOError('Unknown compression method') flag = ord( self.fileobj.read(1) ) - # modtime = self.fileobj.read(4) + self.mtime = read32(self.fileobj) # extraflag = self.fileobj.read(1) # os = self.fileobj.read(1) - self.fileobj.read(6) + self.fileobj.read(2) if flag & FEXTRA: # Read & discard the extra field, if present -- cgit v1.2.1