Fix ellipsis issues of python2.

jedi/evaluate/__init__.py

@@ -310,7 +310,9 @@ class Evaluator(object):
                      self.eval_element(context, element.children[-1]))
         elif typ == 'operator':
             # Must be an ellipsis, other operators are not evaluated.
-            assert element.value == '...'
+            # In Python 2 ellipsis is coded as three single dot tokens, not
+            # as one token 3 dot token.
+            assert element.value in ('.', '...')
             types = set([compiled.create(self, Ellipsis)])
         elif typ == 'dotted_name':
             types = self.eval_atom(context, element.children[0])

jedi/evaluate/iterable.py

@@ -662,7 +662,7 @@ def py__getitem__(evaluator, context, types, trailer):
         if isinstance(index, (compiled.CompiledObject, Slice)):
             index = index.obj
 
-        if type(index) not in (float, int, str, unicode, slice):
+        if type(index) not in (float, int, str, unicode, slice, type(Ellipsis)):
             # If the index is not clearly defined, we have to get all the
             # possiblities.
             for typ in list(types):
@@ -869,7 +869,11 @@ def create_index_types(evaluator, context, index):
     if index == ':':
         # Like array[:]
         return set([Slice(context, None, None, None)])
-    elif index.type == 'subscript':  # subscript is a slice operation.
+
+    elif index.type == 'subscript' and not index.children[0] == '.':
+        # subscript basically implies a slice operation, except for Python 2's
+        # Ellipsis.
+        print(index.children)
         # Like array[:3]
         result = []
         for el in index.children: