Author: Brian Kearns <[email protected]>
Branch:
Changeset: r67450:11fec059468c
Date: 2013-10-16 18:01 -0400
http://bitbucket.org/pypy/pypy/changeset/11fec059468c/
Log: fix scalar any/all return types
diff --git a/pypy/module/micronumpy/interp_boxes.py
b/pypy/module/micronumpy/interp_boxes.py
--- a/pypy/module/micronumpy/interp_boxes.py
+++ b/pypy/module/micronumpy/interp_boxes.py
@@ -227,11 +227,11 @@
def descr_any(self, space):
value = space.is_true(self)
- return space.wrap(W_BoolBox(value))
+ return self.get_dtype(space).box(value)
def descr_all(self, space):
value = space.is_true(self)
- return space.wrap(W_BoolBox(value))
+ return self.get_dtype(space).box(value)
def descr_ravel(self, space):
from pypy.module.micronumpy.base import convert_to_array
diff --git a/pypy/module/micronumpy/test/test_dtypes.py
b/pypy/module/micronumpy/test/test_dtypes.py
--- a/pypy/module/micronumpy/test/test_dtypes.py
+++ b/pypy/module/micronumpy/test/test_dtypes.py
@@ -745,11 +745,11 @@
x = numpy.bool_(False)
assert not x.any()
assert not x.all()
- #
+ assert isinstance(x.any(), numpy.bool_)
x = numpy.float64(0)
assert not x.any()
assert not x.all()
- assert isinstance(x.any(), numpy.bool_)
+ assert isinstance(x.any(), numpy.float64)
def test_ravel(self):
from numpypy import float64, int8, array
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
