Author: Romain Guillebert <[email protected]>
Branch: indexing-by-array
Changeset: r62415:0c8318c09981
Date: 2013-03-19 00:09 +0100
http://bitbucket.org/pypy/pypy/changeset/0c8318c09981/
Log: (mattip, rguillebert) Test int(array(1.5)) -> 1
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
@@ -772,9 +772,9 @@
shape = self.get_shape()
if len(shape) == 0:
assert isinstance(self.implementation, scalar.Scalar)
- return space.wrap(self.implementation.get_scalar_value())
+ return
space.int(space.wrap(self.implementation.get_scalar_value()))
if shape == [1]:
- return self.descr_getitem(space, space.wrap(0))
+ return space.int(self.descr_getitem(space, space.wrap(0)))
raise OperationError(space.w_TypeError, space.wrap("only length-1
arrays can be converted to Python scalars"))
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
@@ -1736,6 +1736,7 @@
assert int(array(1)) == 1
assert int(array([1])) == 1
assert raises(TypeError, "int(array([1, 2]))")
+ assert int(array([1.5])) == 1
class AppTestMultiDim(BaseNumpyAppTest):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
