[pypy-svn] r71123 - in pypy/branch/micronumpy/pypy/module/micronumpy: . test

dan at codespeak.net dan at codespeak.net
Sat Feb 6 06:42:28 CET 2010


Author: dan
Date: Sat Feb  6 06:42:26 2010
New Revision: 71123

Modified:
   pypy/branch/micronumpy/pypy/module/micronumpy/mdarray.py
   pypy/branch/micronumpy/pypy/module/micronumpy/test/test_numpy.py
Log:
Converted mdarray.shape to tuple. Un-skipped test that depended on it.

Modified: pypy/branch/micronumpy/pypy/module/micronumpy/mdarray.py
==============================================================================
--- pypy/branch/micronumpy/pypy/module/micronumpy/mdarray.py	(original)
+++ pypy/branch/micronumpy/pypy/module/micronumpy/mdarray.py	Sat Feb  6 06:42:26 2010
@@ -93,7 +93,7 @@
     return self.dtype
 
 def descr_shape(space, self):
-    return space.wrap(self.shape)
+    return space.newtuple([space.wrap(dim) for dim in self.shape])
 
 def create_mdarray(data_type, unwrap, coerce):
     class MultiDimArray(BaseMultiDimArray):

Modified: pypy/branch/micronumpy/pypy/module/micronumpy/test/test_numpy.py
==============================================================================
--- pypy/branch/micronumpy/pypy/module/micronumpy/test/test_numpy.py	(original)
+++ pypy/branch/micronumpy/pypy/module/micronumpy/test/test_numpy.py	Sat Feb  6 06:42:26 2010
@@ -191,7 +191,7 @@
         from numpy import array
         ar = array([range(i*3, i*3+3) for i in range(3)])
         assert len(ar) == 3
-        skip("mdarray.shape currently is a list instead of a tuple as it should be")
+        #skip("mdarray.shape currently is a list instead of a tuple as it should be")
         assert ar.shape == (3, 3)
         for i in range(3):
             for j in range(3):



More information about the Pypy-commit mailing list