Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: ufuncapi
Changeset: r74396:42b977217d4f
Date: 2014-11-08 09:06 +0200
http://bitbucket.org/pypy/pypy/changeset/42b977217d4f/
Log: fix syntax and imports
diff --git a/pypy/module/micronumpy/nditer.py b/pypy/module/micronumpy/nditer.py
--- a/pypy/module/micronumpy/nditer.py
+++ b/pypy/module/micronumpy/nditer.py
@@ -2,7 +2,7 @@
from pypy.interpreter.typedef import TypeDef, GetSetProperty
from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault
from pypy.interpreter.error import OperationError, oefmt
-from pypy.module.micronumpy import ufuncs, support, concrete
+from pypy.module.micronumpy import support, concrete
from pypy.module.micronumpy.base import W_NDimArray, convert_to_array
from pypy.module.micronumpy.descriptor import decode_w_dtype
from pypy.module.micronumpy.iterators import ArrayIter, SliceIter, OpFlag
@@ -288,8 +288,10 @@
class W_NDIter(W_Root):
_immutable_fields_ = ['ndim', ]
- def __init__(self, space, w_seq, w_flags, w_op_flags, w_op_dtypes,
w_casting,
- w_op_axes, w_itershape, w_buffersize, order):
+ def __init__(self, space, w_seq, w_flags, w_op_flags, w_op_dtypes,
+ w_casting, w_op_axes, w_itershape, w_buffersize, order):
+ from pypy.module.micronumpy.ufuncs import find_binop_result_dtype
+
self.order = order
self.external_loop = False
self.buffered = False
@@ -355,7 +357,7 @@
continue
if self.op_flags[i].rw == 'w':
continue
- out_dtype = ufuncs.find_binop_result_dtype(
+ out_dtype = find_binop_result_dtype(
space, self.seq[i].get_dtype(), out_dtype)
for i in outargs:
if self.seq[i] is None:
diff --git a/pypy/module/micronumpy/ufuncs.py b/pypy/module/micronumpy/ufuncs.py
--- a/pypy/module/micronumpy/ufuncs.py
+++ b/pypy/module/micronumpy/ufuncs.py
@@ -706,7 +706,7 @@
if self.stack_inputs:
inargs = inargs + outargs
it = W_NDIter(space, space.newlist(inargs + outargs),
- flags=flags, op_flags=op_flags,
+ flags=flags, op_flags=op_flags)
for args in it:
space.call_args(func, Arguments.frompacked(space, args))
if len(outargs) > 1:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
