summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-05-11 23:36:40 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-05-11 23:36:40 (GMT)
commitc09c92fd81b05db4e5bfe5322f038ca1727fcde0 (patch)
treea718262c0622f5de7890e672c04e0c12df81386b /Lib
parent2d067c8138ce2cf0dd8a49ea69aa5bf1be31080b (diff)
downloadcpython-c09c92fd81b05db4e5bfe5322f038ca1727fcde0.zip
cpython-c09c92fd81b05db4e5bfe5322f038ca1727fcde0.tar.gz
cpython-c09c92fd81b05db4e5bfe5322f038ca1727fcde0.tar.bz2
Merged revisions 81094 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81094 | antoine.pitrou | 2010-05-12 01:32:31 +0200 (mer., 12 mai 2010) | 6 lines Issue #8672: Add a zlib test ensuring that an incomplete stream can be handled by a decompressor object without errors (it returns incomplete uncompressed data). ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_zlib.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
index 9b7c135..8ff2183 100644
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -379,6 +379,19 @@ class CompressObjectTestCase(BaseCompressTestCase, unittest.TestCase):
dco = zlib.decompressobj()
self.assertEqual(dco.flush(), b"") # Returns nothing
+ def test_decompress_incomplete_stream(self):
+ # This is 'foo', deflated
+ x = b'x\x9cK\xcb\xcf\x07\x00\x02\x82\x01E'
+ # For the record
+ self.assertEqual(zlib.decompress(x), b'foo')
+ self.assertRaises(zlib.error, zlib.decompress, x[:-5])
+ # Omitting the stream end works with decompressor objects
+ # (see issue #8672).
+ dco = zlib.decompressobj()
+ y = dco.decompress(x[:-5])
+ y += dco.flush()
+ self.assertEqual(y, b'foo')
+
if hasattr(zlib.compressobj(), "copy"):
def test_compresscopy(self):
# Test copying a compression object