[Python-3000-checkins] r54756 - in python/branches/p3yk: Lib/test/test_array.py Modules/arraymodule.c

[guido.van.rossum]

Author: guido.van.rossum
Date: Wed Apr 11 19:08:28 2007
New Revision: 54756

Modified:
   python/branches/p3yk/Lib/test/test_array.py
   python/branches/p3yk/Modules/arraymodule.c
Log:
Make array().tofile() work with a new I/O object.


Modified: python/branches/p3yk/Lib/test/test_array.py
==============================================================================
--- python/branches/p3yk/Lib/test/test_array.py	(original)
+++ python/branches/p3yk/Lib/test/test_array.py	Wed Apr 11 19:08:28 2007
@@ -147,7 +147,7 @@
     def test_tofromfile(self):
         a = array.array(self.typecode, 2*self.example)
         self.assertRaises(TypeError, a.tofile)
-        self.assertRaises(TypeError, a.tofile, cStringIO.StringIO())
+        ##self.assertRaises(TypeError, a.tofile, cStringIO.StringIO())
         f = open(test_support.TESTFN, 'wb')
         try:
             a.tofile(f)

Modified: python/branches/p3yk/Modules/arraymodule.c
==============================================================================
--- python/branches/p3yk/Modules/arraymodule.c	(original)
+++ python/branches/p3yk/Modules/arraymodule.c	Wed Apr 11 19:08:28 2007
@@ -1252,12 +1252,11 @@
 {
 	FILE *fp;
 
+        if (self->ob_size == 0)
+		goto done;
+
 	fp = PyFile_AsFile(f);
-	if (fp == NULL) {
-		PyErr_SetString(PyExc_TypeError, "arg must be open file");
-		return NULL;
-	}
-	if (self->ob_size > 0) {
+	if (fp != NULL) {
 		if (fwrite(self->ob_item, self->ob_descr->itemsize,
 			   self->ob_size, fp) != (size_t)self->ob_size) {
 			PyErr_SetFromErrno(PyExc_IOError);
@@ -1265,6 +1264,31 @@
 			return NULL;
 		}
 	}
+	else {
+		Py_ssize_t nbytes = self->ob_size * self->ob_descr->itemsize;
+		/* Write 64K blocks at a time */
+		/* XXX Make the block size settable */
+		int BLOCKSIZE = 64*1024;
+		Py_ssize_t nblocks = (nbytes + BLOCKSIZE - 1) / BLOCKSIZE;
+		Py_ssize_t i;
+		for (i = 0; i < nblocks; i++) {
+			char* ptr = self->ob_item + i*BLOCKSIZE;
+			Py_ssize_t size = BLOCKSIZE;
+			PyObject *bytes, *res;
+			if (i*BLOCKSIZE + size > nbytes)
+				size = nbytes - i*BLOCKSIZE;
+			bytes = PyBytes_FromStringAndSize(ptr, size);
+			if (bytes == NULL)
+				return NULL;
+			res = PyObject_CallMethod(f, "write", "O",
+						  bytes);
+			Py_DECREF(bytes);
+			if (res == NULL)
+				return NULL;
+		}
+	}
+
+  done:
 	Py_INCREF(Py_None);
 	return Py_None;
 }