Author: Vincent Legoll <vincent.leg...@idgrilles.fr>
Branch: fix-1674
Changeset: r81469:4d65b43565ad
Date: 2015-12-19 13:17 +0100
http://bitbucket.org/pypy/pypy/changeset/4d65b43565ad/
Log: Do not use python iter() builtin as variable name
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
@@ -805,22 +805,22 @@
prefixlen = len(prefix_w)
indexlen = len(indexes_w)
dtype = arr.get_dtype()
- iter = PureShapeIter(iter_shape, indexes_w)
+ shape_iter = PureShapeIter(iter_shape, indexes_w)
indexlen = len(indexes_w)
- while not iter.done():
+ while not shape_iter.done():
getitem_int_driver.jit_merge_point(shapelen=shapelen,
indexlen=indexlen,
dtype=dtype, prefixlen=prefixlen)
# prepare the index
index_w = [None] * indexlen
for i in range(indexlen):
- if iter.idx_w_i[i] is not None:
- index_w[i] = iter.idx_w_i[i].getitem(iter.idx_w_s[i])
+ if shape_iter.idx_w_i[i] is not None:
+ index_w[i] =
shape_iter.idx_w_i[i].getitem(shape_iter.idx_w_s[i])
else:
index_w[i] = indexes_w[i]
res.descr_setitem(space, space.newtuple(prefix_w[:prefixlen] +
- iter.get_index(space, shapelen)),
+ shape_iter.get_index(space,
shapelen)),
arr.descr_getitem(space, space.newtuple(index_w)))
- iter.next()
+ shape_iter.next()
return res
setitem_int_driver = jit.JitDriver(name = 'numpy_setitem_int',
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
