Author: Matti Picus <[email protected]>
Branch:
Changeset: r84303:b645c9d24033
Date: 2016-05-08 20:11 +0300
http://bitbucket.org/pypy/pypy/changeset/b645c9d24033/
Log: merge small cleanups branch into default
diff --git a/pypy/module/micronumpy/concrete.py
b/pypy/module/micronumpy/concrete.py
--- a/pypy/module/micronumpy/concrete.py
+++ b/pypy/module/micronumpy/concrete.py
@@ -258,7 +258,6 @@
elif space.is_w(w_idx, space.w_None):
return [NewAxisChunk(), EllipsisChunk()]
result = []
- i = 0
has_ellipsis = False
has_filter = False
for w_item in space.fixedview(w_idx):
@@ -274,7 +273,6 @@
result.append(NewAxisChunk())
elif space.isinstance_w(w_item, space.w_slice):
result.append(SliceChunk(w_item))
- i += 1
elif isinstance(w_item, W_NDimArray) and
w_item.get_dtype().is_bool():
if has_filter:
# in CNumPy, the support for this is incomplete
@@ -287,7 +285,6 @@
result.append(IntegerChunk(w_item.descr_int(space)))
else:
result.append(IntegerChunk(w_item))
- i += 1
if not has_ellipsis:
result.append(EllipsisChunk())
return result
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
@@ -199,7 +199,7 @@
reds='auto')
def call_many_to_many(space, shape, func, in_dtypes, out_dtypes, in_args,
out_args):
- # out must hav been built. func needs no calc_type, is usually an
+ # out must have been built. func needs no calc_type, is usually an
# external ufunc
nin = len(in_args)
in_iters = [None] * nin
@@ -806,7 +806,6 @@
indexlen = len(indexes_w)
dtype = arr.get_dtype()
iter = PureShapeIter(iter_shape, indexes_w)
- indexlen = len(indexes_w)
while not iter.done():
getitem_int_driver.jit_merge_point(shapelen=shapelen,
indexlen=indexlen,
dtype=dtype, prefixlen=prefixlen)
diff --git a/pypy/module/micronumpy/ndarray.py
b/pypy/module/micronumpy/ndarray.py
--- a/pypy/module/micronumpy/ndarray.py
+++ b/pypy/module/micronumpy/ndarray.py
@@ -231,11 +231,11 @@
dim = i
idx = c.w_idx
chunks.pop(i)
- chunks.insert(0, SliceChunk(space.newslice(space.wrap(0),
+ chunks.insert(0, SliceChunk(space.newslice(space.wrap(0),
space.w_None, space.w_None)))
break
if dim > 0:
- view = self.implementation.swapaxes(space, self, 0, dim)
+ view = self.implementation.swapaxes(space, self, 0, dim)
if dim >= 0:
view = new_view(space, self, chunks)
view.setitem_filter(space, idx, val_arr)
@@ -563,7 +563,7 @@
l_w = []
for i in range(self.get_shape()[0]):
item_w = self.descr_getitem(space, space.wrap(i))
- if (isinstance(item_w, W_NDimArray) or
+ if (isinstance(item_w, W_NDimArray) or
isinstance(item_w, boxes.W_GenericBox)):
l_w.append(space.call_method(item_w, "tolist"))
else:
@@ -740,7 +740,7 @@
space.str_w(self.get_dtype().descr_repr(space)),
space.str_w(new_dtype.descr_repr(space)), casting)
order = order_converter(space, space.wrap(order), self.get_order())
- if (not copy and new_dtype == self.get_dtype()
+ if (not copy and new_dtype == self.get_dtype()
and (order in (NPY.KEEPORDER, NPY.ANYORDER) or order ==
self.get_order())
and (subok or type(self) is W_NDimArray)):
return self
diff --git a/pypy/module/micronumpy/strides.py
b/pypy/module/micronumpy/strides.py
--- a/pypy/module/micronumpy/strides.py
+++ b/pypy/module/micronumpy/strides.py
@@ -1,14 +1,13 @@
from pypy.interpreter.error import oefmt
from rpython.rlib import jit
-from pypy.module.micronumpy import support, constants as NPY
+from pypy.module.micronumpy import constants as NPY
from pypy.module.micronumpy.base import W_NDimArray
# structures to describe slicing
class BaseChunk(object):
- _attrs_ = ['step','out_dim']
- pass
+ _attrs_ = ['step', 'out_dim']
class Chunk(BaseChunk):
@@ -36,6 +35,7 @@
class IntegerChunk(BaseChunk):
input_dim = 1
out_dim = 0
+
def __init__(self, w_idx):
self.w_idx = w_idx
@@ -70,6 +70,7 @@
class EllipsisChunk(BaseChunk):
input_dim = 0
out_dim = 0
+
def __init__(self):
pass
@@ -80,6 +81,7 @@
class BooleanChunk(BaseChunk):
input_dim = 1
out_dim = 1
+
def __init__(self, w_idx):
self.w_idx = w_idx
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
