traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make array().tofile() work with a new I/O object.

This commit is contained in:
Guido van Rossum 2007-04-11 17:08:28 +00:00
parent d0712817ac
commit b5ddcfd2a2
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_array.py
View File

@ -147,7 +147,7 @@ class BaseTest(unittest.TestCase):
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)

34
Modules/arraymodule.c
View File

@ -1252,12 +1252,11 @@ array_tofile(arrayobject *self, PyObject *f)
{
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 @@ array_tofile(arrayobject *self, PyObject *f)
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;
}