[pypy-commit] pypy refactor-signature: mergedupstream

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: refactor-signature
Changeset: r50728:a3d170151dfd
Date: 2011-12-19 16:05 -0600
http://bitbucket.org/pypy/pypy/changeset/a3d170151dfd/

Log:	mergedupstream

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
@@ -1187,6 +1187,11 @@
         a = array([1, 2, 3])
         assert dot(a.flat, a.flat) == 14
 
+    def test_flatiter_varray(self):
+        from numpypy import ones
+        a = ones((2, 2))
+        assert list(((a + a).flat)) == [2, 2, 2, 2]
+
     def test_slice_copy(self):
         from numpypy import zeros
         a = zeros((10, 10))