Author: Philip Jenvey <pjen...@underboss.org>
Branch: stdlib-2.7.4
Changeset: r66192:d721f5424f2a
Date: 2013-04-01 18:51 -0700
http://bitbucket.org/pypy/pypy/changeset/d721f5424f2a/
Log: maintain the old unused_data (transplanted from
41bea643d6b454d6a9ca653b7e9b2022a45f5bf2)
diff --git a/pypy/module/zlib/interp_zlib.py b/pypy/module/zlib/interp_zlib.py
--- a/pypy/module/zlib/interp_zlib.py
+++ b/pypy/module/zlib/interp_zlib.py
@@ -303,7 +303,7 @@
tail = data[unused_start:]
if finished:
self.unconsumed_tail = ''
- self.unused_data = tail
+ self.unused_data += tail
else:
self.unconsumed_tail = tail
return self.space.wrap(string)
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
@@ -189,7 +189,7 @@
assert d.unused_data == 'spam' * 100
assert s1 + s2 + s3 == self.expanded
s4 = d.decompress('egg' * 50)
- assert d.unused_data == 'egg' * 50
+ assert d.unused_data == ('spam' * 100) + ('egg' * 50)
assert s4 == ''
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
