Index: Lib/gzip.py =================================================================== --- Lib/gzip.py (révision 85073) +++ Lib/gzip.py (copie de travail) @@ -336,6 +336,26 @@ self.offset += size return chunk + def peek(self, n): + if self.mode != READ: + import errno + raise IOError(errno.EBADF, "read() on write-only GzipFile object") + + # Do not return ridiculously small buffers + if n < 100: + n = 100 + if self.extrasize == 0: + if self.fileobj is None: + return b'' + try: + self._read(max(self.max_read_chunk, n)) + except EOFError: + pass + offset = self.offset - self.extrastart + remaining = self.extrasize + assert remaining == len(self.extrabuf) - offset + return self.extrabuf[offset:offset + n] + def _unread(self, buf): self.extrasize = len(buf) + self.extrasize self.offset -= len(buf) Index: Lib/test/test_gzip.py =================================================================== --- Lib/test/test_gzip.py (révision 85073) +++ Lib/test/test_gzip.py (copie de travail) @@ -286,6 +286,28 @@ with gzip.GzipFile(fileobj=buf, mode="rb") as f: self.assertEqual(f.read(), uncompressed) + def test_peek(self): + uncompressed = data1 * 200 + with gzip.GzipFile(self.filename, "wb") as f: + f.write(uncompressed) + + def sizes(): + while True: + for n in range(5, 50, 10): + yield n + + with gzip.GzipFile(self.filename, "rb") as f: + f.max_read_chunk = 33 + nread = 0 + for n in sizes(): + s = f.peek(n) + if s == b'': + break + self.assertEqual(f.read(len(s)), s) + nread += len(s) + self.assertEqual(f.read(100), b'') + self.assertEqual(nread, len(uncompressed)) + # Testing compress/decompress shortcut functions def test_compress(self):