Author: Brian Kearns <bdkea...@gmail.com>
Branch: numpypy-nditer
Changeset: r69738:cface9ad9ad7
Date: 2014-03-05 16:27 -0500
http://bitbucket.org/pypy/pypy/changeset/cface9ad9ad7/
Log: merge default
diff --git a/pypy/module/micronumpy/concrete.py
b/pypy/module/micronumpy/concrete.py
--- a/pypy/module/micronumpy/concrete.py
+++ b/pypy/module/micronumpy/concrete.py
@@ -2,7 +2,6 @@
from pypy.interpreter.error import OperationError, oefmt
from rpython.rlib import jit
from rpython.rlib.debug import make_sure_not_resized
-from pypy.interpreter.special import Ellipsis
from rpython.rlib.rawstorage import alloc_raw_storage, free_raw_storage, \
raw_storage_getitem, raw_storage_setitem, RAW_STORAGE
from rpython.rtyper.lltypesystem import rffi, lltype
@@ -171,7 +170,6 @@
"""
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 w_idx.is_scalar():
@@ -227,7 +225,7 @@
raise OperationError(space.w_IndexError, space.wrap(
"arrays used as indices must be of integer (or boolean)
type"))
return Chunks([Chunk(*space.decode_index4(w_idx,
self.get_shape()[0]))])
- elif space.is_w(w_idx, space.w_None) or isinstance(w_idx, Ellipsis):
+ elif space.is_w(w_idx, space.w_None):
return Chunks([NewAxisChunk()])
result = []
i = 0
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
