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

[afa at codespeak.net]

Author: afa
Date: Tue Nov 23 18:25:40 2010
New Revision: 79423

Modified:
   pypy/branch/fast-forward/pypy/module/_io/interp_fileio.py
   pypy/branch/fast-forward/pypy/module/_io/test/test_io.py
Log:
FileIO.write() should accept any buffer object


Modified: pypy/branch/fast-forward/pypy/module/_io/interp_fileio.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/_io/interp_fileio.py	(original)
+++ pypy/branch/fast-forward/pypy/module/_io/interp_fileio.py	Tue Nov 23 18:25:40 2010
@@ -340,7 +340,7 @@
     def write_w(self, space, w_data):
         self._check_closed(space)
         self._check_writable(space)
-        data = space.str_w(w_data)
+        data = space.bufferstr_w(w_data)
 
         try:
             n = os.write(self.fd, data)

Modified: pypy/branch/fast-forward/pypy/module/_io/test/test_io.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/_io/test/test_io.py	(original)
+++ pypy/branch/fast-forward/pypy/module/_io/test/test_io.py	Tue Nov 23 18:25:40 2010
@@ -153,3 +153,10 @@
         f = io.open(self.tmpfile, "w+b")
         f.close()
 
+    def test_array_write(self):
+        import _io, array
+        a = array.array(b'i', range(10))
+        n = len(a.tostring())
+        with _io.open(self.tmpfile, "wb", 0) as f:
+            assert f.write(a) == n
+