diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 18:47:48 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 18:47:48 (GMT) |
commit | 5d7428b8ce0ffc79b24b05df2b3d2865db037902 (patch) | |
tree | c673d91d8fe112d194cb9bbf45006b8b35838965 /Modules/arraymodule.c | |
parent | 9f2e346911988cda95fec7c901e8d10d34fa9563 (diff) | |
download | cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.zip cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.tar.gz cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.tar.bz2 |
Fix merge breakage.
Diffstat (limited to 'Modules/arraymodule.c')
-rw-r--r-- | Modules/arraymodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c index 89e3f25..36fec53 100644 --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -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, |