[pypy-commit] pypy py3k-memoryview: Fix test_array.py.

[Manuel Jacob]

Author: Manuel Jacob
Branch: py3k-memoryview
Changeset: r64817:da366d307364
Date: 2013-06-07 12:12 +0200
http://bitbucket.org/pypy/pypy/changeset/da366d307364/

Log:    Fix test_array.py.

diff --git a/pypy/module/array/interp_array.py 
b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -231,7 +231,7 @@
         bytes representation.
         """
         cbuf = self._charbuf_start()
-        s = rffi.charpsize2str(cbuf, self.len * self.itemsize)
+        s = rffi.charpsize2str(cbuf, self.len * self.itemsize_)
         self._charbuf_stop()
         return self.space.wrapbytes(s)
 
@@ -257,15 +257,15 @@
         machine values, as if it had been read from a file using the
         fromfile() method).
         """
-        if len(s) % self.itemsize != 0:
+        if len(s) % self.itemsize_ != 0:
             msg = 'string length not a multiple of item size'
             raise OperationError(self.space.w_ValueError, self.space.wrap(msg))
         oldlen = self.len
-        new = len(s) / self.itemsize
+        new = len(s) / self.itemsize_
         self.setlen(oldlen + new)
         cbuf = self._charbuf_start()
         for i in range(len(s)):
-            cbuf[oldlen * self.itemsize + i] = s[i]
+            cbuf[oldlen * self.itemsize_ + i] = s[i]
         self._charbuf_stop()
 
     @unwrap_spec(n=int)
@@ -276,14 +276,14 @@
         array.  Also called as read.
         """
         try:
-            size = ovfcheck(self.itemsize * n)
+            size = ovfcheck(self.itemsize_ * n)
         except OverflowError:
             raise MemoryError
         w_item = space.call_method(w_f, 'read', space.wrap(size))
         item = space.bytes_w(w_item)
         if len(item) < size:
-            n = len(item) % self.itemsize
-            elems = max(0, len(item) - (len(item) % self.itemsize))
+            n = len(item) % self.itemsize_
+            elems = max(0, len(item) - (len(item) % self.itemsize_))
             if n != 0:
                 item = item[0:elems]
             self.descr_frombytes(space, item)
@@ -393,7 +393,7 @@
         rffi.c_memcpy(
             rffi.cast(rffi.VOIDP, w_a._buffer_as_unsigned()),
             rffi.cast(rffi.VOIDP, self._buffer_as_unsigned()),
-            self.len * self.itemsize
+            self.len * self.itemsize_
         )
         return w_a
 
@@ -403,18 +403,18 @@
         Byteswap all items of the array.  If the items in the array are not 1, 
2,
         4, or 8 bytes in size, RuntimeError is raised.
         """
-        if self.itemsize not in [1, 2, 4, 8]:
+        if self.itemsize_ not in [1, 2, 4, 8]:
             msg = "byteswap not supported for this array"
             raise OperationError(space.w_RuntimeError, space.wrap(msg))
         if self.len == 0:
             return
         bytes = self._charbuf_start()
-        tmp = [bytes[0]] * self.itemsize
-        for start in range(0, self.len * self.itemsize, self.itemsize):
-            stop = start + self.itemsize - 1
-            for i in range(self.itemsize):
+        tmp = [bytes[0]] * self.itemsize_
+        for start in range(0, self.len * self.itemsize_, self.itemsize_):
+            stop = start + self.itemsize_ - 1
+            for i in range(self.itemsize_):
                 tmp[i] = bytes[start + i]
-            for i in range(self.itemsize):
+            for i in range(self.itemsize_):
                 bytes[stop - i] = tmp[i]
         self._charbuf_stop()
 
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit