Author: mattip <[email protected]>
Branch: missing-ndarray-attributes
Changeset: r60352:ecab849d6362
Date: 2013-01-01 09:29 +0200
http://bitbucket.org/pypy/pypy/changeset/ecab849d6362/
Log: oops
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
@@ -155,9 +155,8 @@
iter = x_iter
shapelen = len(shape)
while not iter.done():
- where_driver.jit_merge_point(shapelen=shapelen, shape=shape,
- dtype=dtype, arr_dtype=arr_dtype,
- )
+ where_driver.jit_merge_point(shapelen=shapelen, dtype=dtype,
+ arr_dtype=arr_dtype)
w_cond = arr_iter.getitem()
if arr_dtype.itemtype.bool(w_cond):
w_val = x_iter.getitem().convert_to(dtype)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
