Author: Brian Kearns <bdkea...@gmail.com>
Branch:
Changeset: r69007:caa0da925fad
Date: 2014-01-29 18:15 -0500
http://bitbucket.org/pypy/pypy/changeset/caa0da925fad/
Log: fix array init from array scalar
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
@@ -72,6 +72,8 @@
is_rec_type = dtype is not None and dtype.is_record_type()
if is_rec_type and is_single_elem(space, w_iterable, is_rec_type):
return [], [w_iterable]
+ if isinstance(w_iterable, W_NDimArray) and w_iterable.is_scalar():
+ return [], [w_iterable]
shape = [space.len_w(w_iterable)]
batch = space.listview(w_iterable)
while True:
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
@@ -319,6 +319,9 @@
d = c.reshape(3, 4, 0)
e = d.repeat(3, 0)
assert e.shape == (9, 4, 0)
+ a = array(123)
+ b = array(a, dtype=float)
+ assert b == 123.0
def test_dtype_attribute(self):
import numpy as np
@@ -413,10 +416,6 @@
assert ten == 10
def test_empty(self):
- """
- Test that empty() works.
- """
-
from numpypy import empty
a = empty(2)
a[1] = 1.0
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
