[pypy-commit] pypy numpy-back-to-applevel: another fix?
fijal
noreply at buildbot.pypy.org
Thu Jan 26 22:29:53 CET 2012
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: numpy-back-to-applevel
Changeset: r51821:77d1d7f10210
Date: 2012-01-26 23:10 +0200
http://bitbucket.org/pypy/pypy/changeset/77d1d7f10210/
Log: another fix?
diff --git a/pypy/module/micronumpy/interp_ufuncs.py b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -310,10 +310,10 @@
else:
res_dtype = calc_dtype
if isinstance(w_lhs, Scalar) and isinstance(w_rhs, Scalar):
- return self.func(calc_dtype,
+ return space.wrap(self.func(calc_dtype,
w_lhs.value.convert_to(calc_dtype),
w_rhs.value.convert_to(calc_dtype)
- )
+ ))
new_shape = shape_agreement(space, w_lhs.shape, w_rhs.shape)
w_res = Call2(self.func, self.name,
More information about the pypy-commit
mailing list