[pypy-commit] pypy py3.3: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.3
Changeset: r72510:4e00d712484e
Date: 2014-07-26 15:27 +0200
http://bitbucket.org/pypy/pypy/changeset/4e00d712484e/

Log:	merge heads

diff --git a/pypy/module/zlib/test/test_zlib.py b/pypy/module/zlib/test/test_zlib.py
--- a/pypy/module/zlib/test/test_zlib.py
+++ b/pypy/module/zlib/test/test_zlib.py
@@ -177,6 +177,16 @@
         assert dco.eof == True
         dco.flush()
         assert dco.eof == True
+        
+    def test_decompress_eof_incomplete_stream(self):
+        import zlib
+        x = b'x\x9cK\xcb\xcf\x07\x00\x02\x82\x01E'  # 'foo'
+        dco = zlib.decompressobj()
+        assert dco.eof == False
+        dco.decompress(x[:-5])
+        assert dco.eof == False
+        dco.flush()
+        assert dco.eof == False
 
     def test_decompress_incomplete_stream(self):
         import zlib