Author: Sergey Matyunin <[email protected]>
Branch: numpy_partition
Changeset: r82799:d4fa44a7c61f
Date: 2016-02-29 22:11 +0100
http://bitbucket.org/pypy/pypy/changeset/d4fa44a7c61f/
Log: Fixed tolist for ndarrays containing objects
diff --git a/pypy/module/micronumpy/ndarray.py
b/pypy/module/micronumpy/ndarray.py
--- a/pypy/module/micronumpy/ndarray.py
+++ b/pypy/module/micronumpy/ndarray.py
@@ -534,8 +534,11 @@
return self.get_scalar_value().item(space)
l_w = []
for i in range(self.get_shape()[0]):
- l_w.append(space.call_method(self.descr_getitem(space,
- space.wrap(i)), "tolist"))
+ item_w = self.descr_getitem(space, space.wrap(i))
+ if isinstance(item_w, W_NDimArray):
+ l_w.append(space.call_method(item_w, "tolist"))
+ else:
+ l_w.append(item_w)
return space.newlist(l_w)
def descr_ravel(self, space, w_order=None):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
