Commits

mattip committed 583a3ab

wip, passes test_ztranslation

  • Participants
  • Parent commits 8f5b4f1
  • Branches numpypy-ellipse-indexing

Comments (0)

Files changed (2)

File pypy/interpreter/special.py

     def __init__(self, space):
         self.space = space
 
-    def descr__repr__(self):
-        return self.space.wrap('Ellipsis')
+    def descr__repr__(self, space):
+        return space.wrap('Ellipsis')
 
 
 class NotImplemented(W_Root):
     def __init__(self, space):
         self.space = space
 
-    def descr__repr__(self):
-        return self.space.wrap('NotImplemented')
+    def descr__repr__(self, space):
+        return space.wrap('NotImplemented')

File pypy/module/micronumpy/arrayimpl/concrete.py

      raw_storage_setitem, RAW_STORAGE
 from pypy.module.micronumpy.arrayimpl.sort import argsort_array
 from rpython.rlib.debug import make_sure_not_resized
+from pypy.interpreter.special import Ellipsis
 
 
 class BaseConcreteArray(base.BaseArrayImplementation):
         """
         if (space.isinstance_w(w_idx, space.w_str) or
             space.isinstance_w(w_idx, space.w_slice) or
+            isinstance(w_idx, Ellipsis) or
             space.is_w(w_idx, space.w_None)):
             raise IndexError
         if isinstance(w_idx, W_NDimArray) and not isinstance(w_idx.implementation, scalar.Scalar):