Author: Matti Picus <[email protected]>
Branch:
Changeset: r65801:78634b86b451
Date: 2013-07-30 00:49 +0300
http://bitbucket.org/pypy/pypy/changeset/78634b86b451/
Log: test, fix for uninitialized Scalar.value
diff --git a/pypy/module/micronumpy/base.py b/pypy/module/micronumpy/base.py
--- a/pypy/module/micronumpy/base.py
+++ b/pypy/module/micronumpy/base.py
@@ -37,7 +37,8 @@
from pypy.module.micronumpy.arrayimpl import concrete, scalar
if not shape:
- impl = scalar.Scalar(dtype.base)
+ w_val = dtype.base.coerce(space, space.wrap(0))
+ impl = scalar.Scalar(dtype.base, w_val)
else:
strides, backstrides = calc_strides(shape, dtype.base, order)
impl = concrete.ConcreteArray(shape, dtype.base, order, strides,
@@ -79,6 +80,8 @@
if w_val is not None:
w_val = dtype.coerce(space, w_val)
+ else:
+ w_val = dtype.coerce(space, space.wrap(0))
return W_NDimArray(scalar.Scalar(dtype, w_val))
diff --git a/pypy/module/micronumpy/test/test_numarray.py
b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -264,6 +264,8 @@
assert a.dtype is dtype(int)
a = ndarray([], dtype=float)
assert a.shape == ()
+ # test uninitialized value crash?
+ assert len(str(a)) > 0
def test_ndmin(self):
from numpypy import array
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
