diff Modules/arraymodule.c @ 42335:c8b850b5a066

Fix merge breakage.
author Martin v. Löwis <martin@v.loewis.de>
date Sat, 21 Jul 2007 18:47:48 +0000
parents e70cdce0e8b2
children aab687936ecd
line wrap: on
line diff
--- a/Modules/arraymodule.c	Sat Jul 21 17:22:18 2007 +0000
+++ b/Modules/arraymodule.c	Sat Jul 21 18:47:48 2007 +0000
@@ -1235,7 +1235,7 @@
 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 @@
 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,