*** gzip.py	Thu Feb 12 12:35:06 2004
--- gzip.py-new	Thu Mar 11 14:56:59 2004
***************
*** 39,44 ****
--- 39,47 ----
  def read32(input):
      return struct.unpack("<l", input.read(4))[0]
  
+ def unpack32(buf):
+     return struct.unpack("<l", buf)[0]
+ 
  def open(filename, mode="rb", compresslevel=9):
      """Shorthand for GzipFile(filename, mode, compresslevel).
  
***************
*** 120,125 ****
--- 123,130 ----
  
          self.fileobj = fileobj
          self.offset = 0
+         self.inputbuf = ''
+         self.last8 = ''
  
          if self.mode == WRITE:
              self._write_gzip_header()
***************
*** 155,192 ****
          self.crc = zlib.crc32("")
          self.size = 0
  
      def _read_gzip_header(self):
!         magic = self.fileobj.read(2)
          if magic != '\037\213':
              raise IOError, 'Not a gzipped file'
!         method = ord( self.fileobj.read(1) )
          if method != 8:
              raise IOError, 'Unknown compression method'
!         flag = ord( self.fileobj.read(1) )
          # modtime = self.fileobj.read(4)
          # extraflag = self.fileobj.read(1)
          # os = self.fileobj.read(1)
!         self.fileobj.read(6)
  
          if flag & FEXTRA:
              # Read & discard the extra field, if present
!             xlen = ord(self.fileobj.read(1))
!             xlen = xlen + 256*ord(self.fileobj.read(1))
!             self.fileobj.read(xlen)
          if flag & FNAME:
              # Read and discard a null-terminated string containing the filename
              while True:
!                 s = self.fileobj.read(1)
                  if not s or s=='\000':
                      break
          if flag & FCOMMENT:
              # Read and discard a null-terminated string containing a comment
              while True:
!                 s = self.fileobj.read(1)
                  if not s or s=='\000':
                      break
          if flag & FHCRC:
!             self.fileobj.read(2)     # Read & discard the 16-bit header CRC
  
  
      def write(self,data):
--- 160,211 ----
          self.crc = zlib.crc32("")
          self.size = 0
  
+     def _read_internal(self, size):
+         if len(self.inputbuf) < size:
+             self.inputbuf += self.fileobj.read(size-len(self.inputbuf))
+         chunk = self.inputbuf[:size]
+         # need to use len(chunk) bellow instead of size in case it's EOF.
+         if len(chunk) < 8:
+             self.last8 = self.last8[len(chunk):] + chunk
+         else:
+             self.last8 = chunk[-8:]
+         self.inputbuf = self.inputbuf[size:]
+         return chunk
+ 
      def _read_gzip_header(self):
!         magic = self._read_internal(2)
!         if len(magic) != 2:
!             raise EOFError, "Reached EOF"
          if magic != '\037\213':
              raise IOError, 'Not a gzipped file'
!         method = ord( self._read_internal(1) )
          if method != 8:
              raise IOError, 'Unknown compression method'
!         flag = ord( self._read_internal(1) )
          # modtime = self.fileobj.read(4)
          # extraflag = self.fileobj.read(1)
          # os = self.fileobj.read(1)
!         self._read_internal(6)
  
          if flag & FEXTRA:
              # Read & discard the extra field, if present
!             xlen = ord(self._read_internal(1))
!             xlen = xlen + 256*ord(self._read_internal(1))
!             self._read_internal(xlen)
          if flag & FNAME:
              # Read and discard a null-terminated string containing the filename
              while True:
!                 s = self._read_internal(1)
                  if not s or s=='\000':
                      break
          if flag & FCOMMENT:
              # Read and discard a null-terminated string containing a comment
              while True:
!                 s = self._read_internal(1)
                  if not s or s=='\000':
                      break
          if flag & FHCRC:
!             self._read_internal(2)     # Read & discard the 16-bit header CRC
  
  
      def write(self,data):
***************
*** 247,268 ****
              # If the _new_member flag is set, we have to
              # jump to the next member, if there is one.
              #
!             # First, check if we're at the end of the file;
!             # if so, it's time to stop; no more members to read.
!             pos = self.fileobj.tell()   # Save current position
!             self.fileobj.seek(0, 2)     # Seek to end of file
!             if pos == self.fileobj.tell():
!                 raise EOFError, "Reached EOF"
!             else:
!                 self.fileobj.seek( pos ) # Return to original position
! 
              self._init_read()
              self._read_gzip_header()
              self.decompress = zlib.decompressobj(-zlib.MAX_WBITS)
              self._new_member = False
  
          # Read a chunk of data from the file
!         buf = self.fileobj.read(size)
  
          # If the EOF has been reached, flush the decompression object
          # and mark this object as finished.
--- 266,280 ----
              # If the _new_member flag is set, we have to
              # jump to the next member, if there is one.
              #
!             # _read_gzip_header will raise EOFError exception
!             # if there no more members to read.
              self._init_read()
              self._read_gzip_header()
              self.decompress = zlib.decompressobj(-zlib.MAX_WBITS)
              self._new_member = False
  
          # Read a chunk of data from the file
!         buf = self._read_internal(size)
  
          # If the EOF has been reached, flush the decompression object
          # and mark this object as finished.
***************
*** 278,288 ****
  
          if self.decompress.unused_data != "":
              # Ending case: we've come to the end of a member in the file,
!             # so seek back to the start of the unused data, finish up
!             # this member, and read a new gzip header.
!             # (The number of bytes to seek back is the length of the unused
!             # data, minus 8 because _read_eof() will rewind a further 8 bytes)
!             self.fileobj.seek( -len(self.decompress.unused_data)+8, 1)
  
              # Check the CRC and file size, and set the flag so we read
              # a new member on the next call
--- 290,298 ----
  
          if self.decompress.unused_data != "":
              # Ending case: we've come to the end of a member in the file,
!             # so put back unused_data and initialize last8 by reading them.
!             self.inputbuf = self.decompress.unused_data + self.inputbuf
!             self._read_internal(8)
  
              # Check the CRC and file size, and set the flag so we read
              # a new member on the next call
***************
*** 301,309 ****
          # We check the that the computed CRC and size of the
          # uncompressed data matches the stored values.  Note that the size
          # stored is the true file size mod 2**32.
!         self.fileobj.seek(-8, 1)
!         crc32 = read32(self.fileobj)
!         isize = U32(read32(self.fileobj))   # may exceed 2GB
          if U32(crc32) != U32(self.crc):
              raise IOError, "CRC check failed"
          elif isize != LOWU32(self.size):
--- 311,318 ----
          # We check the that the computed CRC and size of the
          # uncompressed data matches the stored values.  Note that the size
          # stored is the true file size mod 2**32.
!         crc32 = unpack32(self.last8[:4])
!         isize = U32(unpack32(self.last8[4:]))   # may exceed 2GB
          if U32(crc32) != U32(self.crc):
              raise IOError, "CRC check failed"
          elif isize != LOWU32(self.size):