[pypy-commit] pypy missing-ndarray-attributes: fix copy for StringType
mattip
noreply at buildbot.pypy.org
Tue Jan 29 18:54:22 CET 2013
Author: Matti Picus <matti.picus at gmail.com>
Branch: missing-ndarray-attributes
Changeset: r60696:b0a0486d2dbd
Date: 2013-01-29 19:36 +0200
http://bitbucket.org/pypy/pypy/changeset/b0a0486d2dbd/
Log: fix copy for StringType
diff --git a/pypy/module/micronumpy/interp_boxes.py b/pypy/module/micronumpy/interp_boxes.py
--- a/pypy/module/micronumpy/interp_boxes.py
+++ b/pypy/module/micronumpy/interp_boxes.py
@@ -289,7 +289,7 @@
return W_StringBox(arr, 0, arr.dtype)
def convert_to(self, dtype):
- from pypy.modules.micronumpy import types
+ from pypy.module.micronumpy import types
assert isinstance(dtype.itemtype, types.StringType)
return self
@@ -306,7 +306,7 @@
return W_UnicodeBox(arr, 0, arr.dtype)
def convert_to(self, dtype):
- from pypy.modules.micronumpy import types
+ from pypy.module.micronumpy import types
assert isinstance(dtype.itemtype, types.UnicodeType)
return self
diff --git a/pypy/module/micronumpy/test/test_numarray.py b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -348,7 +348,7 @@
a = array(['abc', 'def','xyz'], dtype='S3')
b = a.copy()
- assert (b == a).all()
+ assert b[0] == a[0]
def test_iterator_init(self):
from _numpypy import array
More information about the pypy-commit
mailing list