[pypy-commit] pypy default: whoops, was not rpython

mattip noreply at buildbot.pypy.org
Fri Aug 24 07:21:24 CEST 2012


Author: mattip <matti.picus at gmail.com>
Branch: 
Changeset: r56834:da39fb7a0ab6
Date: 2012-08-24 08:20 +0300
http://bitbucket.org/pypy/pypy/changeset/da39fb7a0ab6/

Log:	whoops, was not rpython

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
@@ -48,10 +48,11 @@
     return rstrides, rbackstrides
 
 def is_single_elem(space, w_elem, is_rec_type):
+    from pypy.module.micronumpy.interp_numarray import BaseArray
     if (is_rec_type and space.isinstance_w(w_elem, space.w_tuple)):
         return True
     if (space.isinstance_w(w_elem, space.w_tuple) or
-        hasattr(w_elem, 'shape') or    
+        isinstance(w_elem, BaseArray) or    
         space.isinstance_w(w_elem, space.w_list)):
         return False
     return True


More information about the pypy-commit mailing list