[pypy-svn] r79158 - in pypy/branch/fast-forward/pypy/module/_io: . test

[afa at codespeak.net]

Author: afa
Date: Tue Nov 16 18:09:19 2010
New Revision: 79158

Modified:
   pypy/branch/fast-forward/pypy/module/_io/interp_bytesio.py
   pypy/branch/fast-forward/pypy/module/_io/test/test_bytesio.py
Log:
Test and Fix in BytesIO.read()


Modified: pypy/branch/fast-forward/pypy/module/_io/interp_bytesio.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/_io/interp_bytesio.py	(original)
+++ pypy/branch/fast-forward/pypy/module/_io/interp_bytesio.py	Tue Nov 16 18:09:19 2010
@@ -38,9 +38,9 @@
         size = convert_size(space, w_size)
 
         # adjust invalid sizes
-        n = self.string_size - self.pos
-        if not 0 <= n <= size:
-            size = n
+        available = self.string_size - self.pos
+        if not 0 <= size <= available:
+            size = available
             if size < 0:
                 size = 0
 

Modified: pypy/branch/fast-forward/pypy/module/_io/test/test_bytesio.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/_io/test/test_bytesio.py	(original)
+++ pypy/branch/fast-forward/pypy/module/_io/test/test_bytesio.py	Tue Nov 16 18:09:19 2010
@@ -25,6 +25,7 @@
         f = _io.BytesIO("hello")
         assert f.read() == "hello"
         import gc; gc.collect()
+        assert f.read(8192) == ""
         f.close()
 
     def test_seek(self):