[pypy-commit] pypy numpy-refactor: fixes
fijal
noreply at buildbot.pypy.org
Tue Sep 11 14:37:22 CEST 2012
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: numpy-refactor
Changeset: r57278:a15661986363
Date: 2012-09-11 14:35 +0200
http://bitbucket.org/pypy/pypy/changeset/a15661986363/
Log: fixes
diff --git a/pypy/module/micronumpy/interp_ufuncs.py b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -224,12 +224,11 @@
def call(self, space, args_w):
w_obj = args_w[0]
+ out = None
if len(args_w) > 1:
- w_out = args_w[1]
- if space.is_w(w_out, space.w_None):
- out = None
- else:
- out = w_out
+ out = args_w[1]
+ if space.is_w(out, space.w_None):
+ out = None
w_obj = convert_to_array(space, w_obj)
calc_dtype = find_unaryop_result_dtype(space,
w_obj.get_dtype(),
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
@@ -170,7 +170,7 @@
def count_all_true(arr):
s = 0
if arr.is_scalar():
- return arr.find_dtype().itemtype.bool(arr.get_scalar_value())
+ return arr.get_dtype().itemtype.bool(arr.get_scalar_value())
iter = arr.create_iter()
while not iter.done():
s += iter.getitem_bool()
More information about the pypy-commit
mailing list