Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r51899:c9343ef21049
Date: 2012-01-28 01:09 +0200
http://bitbucket.org/pypy/pypy/changeset/c9343ef21049/
Log: improve fake objspace and fix translation
diff --git a/pypy/module/micronumpy/interp_numarray.py
b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -285,7 +285,7 @@
def descr_flatten(self, space, w_order=None):
if isinstance(self, Scalar):
# scalars have no storage
- return self.descr_reshape(space, [space.wrap([1])])
+ return self.descr_reshape(space, [space.wrap(1)])
concr = self.get_concrete()
w_res = concr.descr_ravel(space, w_order)
if w_res.storage == concr.storage:
diff --git a/pypy/objspace/fake/objspace.py b/pypy/objspace/fake/objspace.py
--- a/pypy/objspace/fake/objspace.py
+++ b/pypy/objspace/fake/objspace.py
@@ -150,6 +150,8 @@
self._see_getsetproperty(x)
if isinstance(x, r_singlefloat):
self._wrap_not_rpython(x)
+ if isinstance(x, list):
+ self._wrap_not_rpython(x)
return w_some_obj()
wrap._annspecialcase_ = "specialize:argtype(1)"
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
