[pypy-commit] pypy py3.5: read1 requires a size arg

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3.5
Changeset: r89592:3d8aabbf51c6
Date: 2017-01-15 10:42 -0800
http://bitbucket.org/pypy/pypy/changeset/3d8aabbf51c6/

Log:	read1 requires a size arg

diff --git a/pypy/module/_io/interp_bytesio.py b/pypy/module/_io/interp_bytesio.py
--- a/pypy/module/_io/interp_bytesio.py
+++ b/pypy/module/_io/interp_bytesio.py
@@ -78,6 +78,9 @@
         size = convert_size(space, w_size)
         return space.newbytes(self.read(size))
 
+    def read1_w(self, space, w_size):
+        self.read_w(self, space, w_size)
+
     def readline_w(self, space, w_limit=None):
         self._check_closed(space)
         limit = convert_size(space, w_limit)
@@ -205,7 +208,7 @@
     __init__  = interp2app(W_BytesIO.descr_init),
 
     read = interp2app(W_BytesIO.read_w),
-    read1 = interp2app(W_BytesIO.read_w),
+    read1 = interp2app(W_BytesIO.read1_w),
     readline = interp2app(W_BytesIO.readline_w),
     readinto = interp2app(W_BytesIO.readinto_w),
     readinto1 = interp2app(W_BytesIO.readinto_w),
diff --git a/pypy/module/_io/test/test_bytesio.py b/pypy/module/_io/test/test_bytesio.py
--- a/pypy/module/_io/test/test_bytesio.py
+++ b/pypy/module/_io/test/test_bytesio.py
@@ -143,6 +143,12 @@
         memio.close()
         raises(ValueError, memio.getbuffer)
 
+    def test_read1(self):
+        import _io
+        memio = _io.BytesIO(b"1234567890")
+        raises(TypeError, memio.read1)
+        assert memio.read() == b"1234567890"
+
     def test_readline(self):
         import _io
         f = _io.BytesIO(b'abc\ndef\nxyzzy\nfoo\x00bar\nanother line')