Author: Brian Kearns <[email protected]>
Branch:
Changeset: r68465:b63fad133ab6
Date: 2013-12-18 04:53 -0500
http://bitbucket.org/pypy/pypy/changeset/b63fad133ab6/
Log: cleanup
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
@@ -539,7 +539,7 @@
def descr_astype(self, space, w_dtype):
dtype = space.interp_w(interp_dtype.W_Dtype,
- space.call_function(space.gettypefor(interp_dtype.W_Dtype), w_dtype))
+ space.call_function(space.gettypefor(interp_dtype.W_Dtype),
w_dtype))
impl = self.implementation
if isinstance(impl, scalar.Scalar):
return W_NDimArray.new_scalar(space, dtype, impl.value)
@@ -1445,25 +1445,18 @@
@unwrap_spec(order=str)
def zeros(space, w_shape, w_dtype=None, order='C'):
dtype = space.interp_w(interp_dtype.W_Dtype,
- space.call_function(space.gettypefor(interp_dtype.W_Dtype), w_dtype)
- )
+ space.call_function(space.gettypefor(interp_dtype.W_Dtype), w_dtype))
shape = _find_shape(space, w_shape, dtype)
- if not shape:
- return W_NDimArray.new_scalar(space, dtype, space.wrap(0))
- return space.wrap(W_NDimArray.from_shape(space, shape, dtype=dtype,
order=order))
+ return W_NDimArray.from_shape(space, shape, dtype=dtype, order=order)
@unwrap_spec(order=str)
def ones(space, w_shape, w_dtype=None, order='C'):
dtype = space.interp_w(interp_dtype.W_Dtype,
- space.call_function(space.gettypefor(interp_dtype.W_Dtype), w_dtype)
- )
+ space.call_function(space.gettypefor(interp_dtype.W_Dtype), w_dtype))
shape = _find_shape(space, w_shape, dtype)
- if not shape:
- return W_NDimArray.new_scalar(space, dtype, space.wrap(0))
w_arr = W_NDimArray.from_shape(space, shape, dtype=dtype, order=order)
- one = dtype.box(1)
- w_arr.fill(space, one)
- return space.wrap(w_arr)
+ w_arr.fill(space, dtype.box(1))
+ return w_arr
@unwrap_spec(subok=bool)
def empty_like(space, w_a, w_dtype=None, w_order=None, subok=True):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
