Author: Alex Gaynor <alex.gay...@gmail.com>
Branch:
Changeset: r67623:b2974d88f4d3
Date: 2013-10-25 15:36 -0700
http://bitbucket.org/pypy/pypy/changeset/b2974d88f4d3/
Log: merged upstream
diff --git a/pypy/module/micronumpy/interp_numarray.py
b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -166,10 +166,9 @@
self._prepare_array_index(space, w_index)
if iter_shape is None:
# w_index is a list of slices
- w_value = convert_to_array(space, w_value)
chunks = self.implementation._prepare_slice_args(space, w_index)
view = chunks.apply(space, self)
- view.implementation.setslice(space, w_value)
+ view.implementation.setslice(space, val_arr)
return
loop.setitem_array_int(space, self, iter_shape, indexes, val_arr,
prefix)
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -58,8 +58,6 @@
specialize.argtype(1)(func)
@functools.wraps(func)
def dispatcher(self, v):
- from pypy.module.micronumpy.interp_boxes import W_GenericBox
- assert isinstance(v, W_GenericBox)
return self.box_component(
func(
self,
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
