Author: Brian Kearns <[email protected]>
Branch:
Changeset: r67401:cca686ae3c69
Date: 2013-10-15 19:21 -0400
http://bitbucket.org/pypy/pypy/changeset/cca686ae3c69/
Log: test/fix position of dtype/out args for ndarray reduce ufuncs
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
@@ -846,7 +846,7 @@
def _reduce_ufunc_impl(ufunc_name, promote_to_largest=False,
cumultative=False):
- def impl(self, space, w_axis=None, w_out=None, w_dtype=None):
+ def impl(self, space, w_axis=None, w_dtype=None, w_out=None):
if space.is_none(w_out):
out = None
elif not isinstance(w_out, W_NDimArray):
diff --git a/pypy/module/micronumpy/test/test_numarray.py
b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -2156,6 +2156,7 @@
c = b + b
assert c.sum() == (6 + 8 + 10 + 12) * 2
assert isinstance(c.sum(dtype='f8'), float)
+ assert isinstance(c.sum(None, 'f8'), float)
def test_transpose(self):
from numpypy import array
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
