Author: mattip <matti.pi...@gmail.com>
Branch: object-dtype2
Changeset: r76735:cf2a8ac882f6
Date: 2015-04-07 09:33 +0300
http://bitbucket.org/pypy/pypy/changeset/cf2a8ac882f6/
Log: fix tests
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -1692,6 +1692,8 @@
w_obj = self.space.newint(w_obj)
elif isinstance(w_obj, lltype.Number):
w_obj = self.space.newint(w_obj)
+ elif isinstance(w_obj, float):
+ w_obj = self.space.newfloat(w_obj)
else:
raise oefmt(self.space.w_NotImplementedError,
"cannot create object array/scalar from lltype")
@@ -1718,13 +1720,13 @@
def eq(self, v1, v2):
return self.space.eq_w(v1, v2)
- @raw_binary_op
+ @simple_binary_op
def max(self, v1, v2):
if self.space.is_true(self.space.ge(v1, v2)):
return v1
return v2
- @raw_binary_op
+ @simple_binary_op
def min(self, v1, v2):
if self.space.is_true(self.space.le(v1, v2)):
return v1
@@ -1740,7 +1742,6 @@
not self.space.len_w(v) == 0
def _bool(self, v):
- #assert isinstance(v, W_Root)
return self.space.bool_w(v)
@raw_binary_op
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
