Author: Brian Kearns <[email protected]>
Branch:
Changeset: r67697:b974175856c4
Date: 2013-10-29 13:08 -0400
http://bitbucket.org/pypy/pypy/changeset/b974175856c4/
Log: rename numpy support.int_w to index_w for clarity
diff --git a/pypy/module/micronumpy/arrayimpl/concrete.py
b/pypy/module/micronumpy/arrayimpl/concrete.py
--- a/pypy/module/micronumpy/arrayimpl/concrete.py
+++ b/pypy/module/micronumpy/arrayimpl/concrete.py
@@ -121,7 +121,7 @@
for i, w_index in enumerate(view_w):
if space.isinstance_w(w_index, space.w_slice):
raise IndexError
- idx = support.int_w(space, w_index)
+ idx = support.index_w(space, w_index)
if idx < 0:
idx = self.get_shape()[i] + idx
if idx < 0 or idx >= self.get_shape()[i]:
@@ -193,7 +193,7 @@
return self._lookup_by_index(space, view_w)
if shape_len > 1:
raise IndexError
- idx = support.int_w(space, w_idx)
+ idx = support.index_w(space, w_idx)
return self._lookup_by_index(space, [space.wrap(idx)])
@jit.unroll_safe
diff --git a/pypy/module/micronumpy/interp_arrayops.py
b/pypy/module/micronumpy/interp_arrayops.py
--- a/pypy/module/micronumpy/interp_arrayops.py
+++ b/pypy/module/micronumpy/interp_arrayops.py
@@ -191,7 +191,7 @@
return out
def put(space, w_arr, w_indices, w_values, w_mode):
- from pypy.module.micronumpy.support import int_w
+ from pypy.module.micronumpy.support import index_w
arr = convert_to_array(space, w_arr)
mode = clipmode_converter(space, w_mode)
@@ -217,7 +217,7 @@
v_idx = 0
for idx in indices:
- index = int_w(space, idx)
+ index = index_w(space, idx)
if index < 0 or index >= arr.get_size():
if mode == NPY_RAISE:
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
@@ -10,8 +10,8 @@
from rpython.rtyper.lltypesystem import lltype, rffi
from pypy.module.micronumpy.base import W_NDimArray
from pypy.module.micronumpy.iter import PureShapeIterator
+from pypy.module.micronumpy.support import index_w
from pypy.module.micronumpy.constants import *
-from pypy.module.micronumpy.support import int_w
call2_driver = jit.JitDriver(name='numpy_call2',
greens = ['shapelen', 'func', 'calc_dtype',
@@ -581,7 +581,7 @@
while not arr_iter.done():
choose_driver.jit_merge_point(shapelen=shapelen, dtype=dtype,
mode=mode)
- index = int_w(space, arr_iter.getitem())
+ index = index_w(space, arr_iter.getitem())
if index < 0 or index >= len(iterators):
if mode == NPY_RAISE:
raise OperationError(space.w_ValueError, space.wrap(
diff --git a/pypy/module/micronumpy/support.py
b/pypy/module/micronumpy/support.py
--- a/pypy/module/micronumpy/support.py
+++ b/pypy/module/micronumpy/support.py
@@ -1,7 +1,7 @@
from rpython.rlib import jit
from pypy.interpreter.error import OperationError
-def int_w(space, w_obj):
+def index_w(space, w_obj):
try:
return space.int_w(space.index(w_obj))
except OperationError:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
