mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Fix merge breakage.

Browse source
This commit is contained in:
Martin v. Löwis 2007-07-21 18:47:48 +00:00
parent 9f2e346911
commit 5d7428b8ce
9 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/arraymodule.c
View file

@ -1235,7 +1235,7 @@ array. Also called as read.");
static PyObject *
array_tofile(arrayobject *self, PyObject *f)
{
Py_ssize_t nbytes = self->ob_size * self->ob_descr->itemsize;
Py_ssize_t nbytes = Py_Size(self) * self->ob_descr->itemsize;
/* Write 64K blocks at a time */
/* XXX Make the block size settable */
int BLOCKSIZE = 64*1024;
@ -1383,7 +1383,7 @@ static PyObject *
array_tostring(arrayobject *self, PyObject *unused)
{
return PyBytes_FromStringAndSize(self->ob_item,
self->ob_size * self->ob_descr->itemsize);
Py_Size(self) * self->ob_descr->itemsize);
}
PyDoc_STRVAR(tostring_doc,