[pypy-commit] pypy default: merge heads

arigo noreply at buildbot.pypy.org
Wed Aug 31 21:36:34 CEST 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r46958:d5c039d3989a
Date: 2011-08-31 21:36 +0200
http://bitbucket.org/pypy/pypy/changeset/d5c039d3989a/

Log:	merge heads

diff --git a/pypy/module/bz2/test/test_bz2_file.py b/pypy/module/bz2/test/test_bz2_file.py
--- a/pypy/module/bz2/test/test_bz2_file.py
+++ b/pypy/module/bz2/test/test_bz2_file.py
@@ -274,14 +274,14 @@
             pass
         del bz2f   # delete from this frame, which is captured in the traceback
 
-    def test_read_chunk10(self):
+    def test_read_chunk9(self):
         from bz2 import BZ2File
         self.create_temp_file()
         
         bz2f = BZ2File(self.temppath)
         text_read = ""
         while True:
-            data = bz2f.read(10)
+            data = bz2f.read(9) # 9 doesn't divide evenly into data length
             if not data:
                 break
             text_read = "%s%s" % (text_read, data)


More information about the pypy-commit mailing list