diff options
author | Pauli Virtanen <pav@iki.fi> | 2010-10-10 23:50:53 +0200 |
---|---|---|
committer | Pauli Virtanen <pav@iki.fi> | 2010-10-11 00:01:25 +0200 |
commit | d7ff9074fcde66225478d6721cf22b2db32dc2fd (patch) | |
tree | 67fe8488accac8601159eb8d9bd197ce8a85195e /numpy/lib/index_tricks.py | |
parent | 68e31fe815e0cb6276970a1c365f21e187d10ca0 (diff) | |
download | numpy-d7ff9074fcde66225478d6721cf22b2db32dc2fd.tar.gz |
BUG: lib: clean up ancient-Python era stuff from IndexExpression (#1196)
Diffstat (limited to 'numpy/lib/index_tricks.py')
-rw-r--r-- | numpy/lib/index_tricks.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py index eb1ab22e9..264ebaad0 100644 --- a/numpy/lib/index_tricks.py +++ b/numpy/lib/index_tricks.py @@ -700,24 +700,15 @@ class IndexExpression(object): array([2, 4]) """ - maxint = sys.maxint def __init__(self, maketuple): self.maketuple = maketuple def __getitem__(self, item): - if self.maketuple and type(item) != type(()): + if self.maketuple and type(item) != tuple: return (item,) else: return item - def __len__(self): - return self.maxint - - def __getslice__(self, start, stop): - if stop == self.maxint: - stop = None - return self[start:stop:None] - index_exp = IndexExpression(maketuple=True) s_ = IndexExpression(maketuple=False) |