Author: mattip <[email protected]>
Branch:
Changeset: r80520:af5d2330798e
Date: 2015-11-03 19:42 +0200
http://bitbucket.org/pypy/pypy/changeset/af5d2330798e/
Log: remove extra quotes in conversion from object dtype to unicode,
continuation of cdb5f895892c
diff --git a/pypy/module/micronumpy/test/test_object_arrays.py
b/pypy/module/micronumpy/test/test_object_arrays.py
--- a/pypy/module/micronumpy/test/test_object_arrays.py
+++ b/pypy/module/micronumpy/test/test_object_arrays.py
@@ -178,6 +178,7 @@
assert 'a' * 100 in str(a)
b = a.astype('U')
assert b.dtype == 'U100'
+ assert 'a' * 100 in str(b)
a = np.array([123], dtype='U')
assert a[0] == u'123'
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -2221,7 +2221,10 @@
def coerce(self, space, dtype, w_item):
if isinstance(w_item, boxes.W_UnicodeBox):
return w_item
- value = space.unicode_w(space.unicode_from_object(w_item))
+ if isinstance(w_item, boxes.W_ObjectBox):
+ value = space.unicode_w(space.unicode_from_object(w_item.w_obj))
+ else:
+ value = space.unicode_w(space.unicode_from_object(w_item))
return boxes.W_UnicodeBox(value)
def store(self, arr, i, offset, box, native):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
