Issue #2846: Add support for gzip.GzipFile reading zero-padded files.
Patch by Brian Curtin.
diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst
index c76bae8..b789a3c 100644
--- a/Doc/library/gzip.rst
+++ b/Doc/library/gzip.rst
@@ -72,6 +72,9 @@
.. versionchanged:: 2.7
Support for the :keyword:`with` statement was added.
+ .. versionchanged:: 2.7
+ Support for zero-padded files was added.
+
.. function:: open(filename[, mode[, compresslevel]])
diff --git a/Lib/gzip.py b/Lib/gzip.py
index 26f4354..13f2ca2 100644
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -330,6 +330,15 @@
elif isize != (self.size & 0xffffffffL):
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 = "\x00"
+ while c == "\x00":
+ c = self.fileobj.read(1)
+ if c:
+ self.fileobj.seek(-1, 1)
+
@property
def closed(self):
return self.fileobj is None
diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py
index 60094dc..b690134 100644
--- a/Lib/test/test_gzip.py
+++ b/Lib/test/test_gzip.py
@@ -252,6 +252,18 @@
else:
self.fail("1/0 didn't raise an exception")
+ def test_zero_padded_file(self):
+ with gzip.GzipFile(self.filename, "wb") as f:
+ f.write(data1 * 50)
+
+ # Pad the file with zeroes
+ with open(self.filename, "ab") as f:
+ f.write("\x00" * 50)
+
+ with gzip.GzipFile(self.filename, "rb") as f:
+ d = f.read()
+ self.assertEqual(d, data1 * 50, "Incorrect data in file")
+
def test_main(verbose=None):
test_support.run_unittest(TestGzip)
diff --git a/Misc/NEWS b/Misc/NEWS
index 82f3d92..312a2a9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,9 @@
Library
-------
+- Issue #2846: Add support for gzip.GzipFile reading zero-padded files.
+ Patch by Brian Curtin.
+
- Issue #5827: Make sure that normpath preserves unicode. Initial patch
by Matt Giuca.