Author: mattip <matti.pi...@gmail.com>
Branch: numpy-fixes
Changeset: r76995:2795331a0d8c
Date: 2015-05-03 00:11 +0300
http://bitbucket.org/pypy/pypy/changeset/2795331a0d8c/
Log: fix translation
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
@@ -298,13 +298,13 @@
def ge(self, v1, v2):
return v1 >= v2
- @simple_binary_op
+ @raw_binary_op
def logical_and(self, v1, v2):
if bool(v1) and bool(v2):
return Bool._True
return Bool._False
- @simple_binary_op
+ @raw_binary_op
def logical_or(self, v1, v2):
if bool(v1) or bool(v2):
return Bool._True
@@ -1286,7 +1286,7 @@
def _cbool(self, v):
return bool(v[0]) or bool(v[1])
- @simple_binary_op
+ @raw_binary_op
def logical_and(self, v1, v2):
if self._cbool(v1) and self._cbool(v2):
return Bool._True
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
