mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 77472-77473 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77472 | antoine.pitrou | 2010-01-13 15:32:10 +0100 (mer., 13 janv. 2010) | 5 lines

  Issue #2846: Add support for gzip.GzipFile reading zero-padded files.
  Patch by Brian Curtin.
........
  r77473 | antoine.pitrou | 2010-01-13 15:32:51 +0100 (mer., 13 janv. 2010) | 3 lines

  Add ACKS entry for r77472.
........
This commit is contained in:
Antoine Pitrou 2010-01-13 14:37:26 +00:00
parent f068f94e82
commit 8e33fd78c4
5 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/gzip.py
View file

@ -348,6 +348,15 @@ class GzipFile(io.BufferedIOBase):
elif isize != (self.size & 0xffffffff):
raise IOError("Incorrect length of data produced")
# Gzip files can be padded with zeroes and still have archives.
# Consume all zero bytes and set the file position to the first
# non-zero byte. See http://www.gzip.org/#faq8
c = b"\x00"
while c == b"\x00":
c = self.fileobj.read(1)
if c:
self.fileobj.seek(-1, 1)
@property
def closed(self):
return self.fileobj is None