Author: mattip <[email protected]>
Branch:
Changeset: r78647:18a12b7bba21
Date: 2015-07-24 08:55 +0300
http://bitbucket.org/pypy/pypy/changeset/18a12b7bba21/
Log: more conditions for fix in cb76e099cd71
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
@@ -713,7 +713,8 @@
if use_min_scalar:
w_arg1 = convert_to_array(space, w_arg1)
w_arg2 = convert_to_array(space, w_arg2)
- elif in_casting == 'safe' and l_dtype.num == 7 and r_dtype.num == 7:
+ elif (in_casting == 'safe' and l_dtype.num == 7 and r_dtype.num == 7
and
+ out is None and not self.promote_to_float):
# while long (7) can be cast to int32 (5) on 32 bit, don't do it
return l_dtype, l_dtype
for dt_in, dt_out in self.dtypes:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
