Author: Ronan Lamy <[email protected]>
Branch: fix-result-types
Changeset: r77310:0c1c8b19d2e3
Date: 2015-05-12 20:02 +0100
http://bitbucket.org/pypy/pypy/changeset/0c1c8b19d2e3/
Log: cleanup
diff --git a/pypy/module/micronumpy/ufuncs.py b/pypy/module/micronumpy/ufuncs.py
--- a/pypy/module/micronumpy/ufuncs.py
+++ b/pypy/module/micronumpy/ufuncs.py
@@ -521,18 +521,6 @@
w_lhs.get_scalar_value(),
w_rhs.get_scalar_value(),
calc_dtype, res_dtype, out)
- arr = self.func(calc_dtype,
- w_lhs.get_scalar_value().convert_to(space, calc_dtype),
- w_rhs.get_scalar_value().convert_to(space, calc_dtype)
- )
- if isinstance(out, W_NDimArray):
- if out.is_scalar():
- out.set_scalar_value(arr)
- else:
- out.fill(space, arr)
- else:
- out = arr
- return out
if isinstance(w_lhs, boxes.W_GenericBox):
w_lhs = W_NDimArray.from_scalar(space, w_lhs)
assert isinstance(w_lhs, W_NDimArray)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
