merging refs/remotes/origin/master into HEAD

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)