Author: Maciej Fijalkowski <[email protected]>
Branch: numpy-refactor
Changeset: r57265:7383b233e9b6
Date: 2012-09-11 14:05 +0200
http://bitbucket.org/pypy/pypy/changeset/7383b233e9b6/
Log: simplify
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
@@ -34,9 +34,6 @@
def convert_to(self, dtype):
return dtype.box(self.value)
- def is_true(self):
- return bool(self.value)
-
class W_GenericBox(Wrappable):
_attrs_ = ()
diff --git a/pypy/module/micronumpy/loop.py b/pypy/module/micronumpy/loop.py
--- a/pypy/module/micronumpy/loop.py
+++ b/pypy/module/micronumpy/loop.py
@@ -161,7 +161,7 @@
def count_all_true(arr):
s = 0
if arr.is_scalar():
- return arr.get_scalar_value().is_true()
+ return arr.find_dtype().itemtype.bool(arr.get_scalar_value())
iter = arr.create_iter()
while not iter.done():
s += iter.getitem_bool()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
