Merge branch 'linter' of github.com:davidhalter/jedi into linter

This commit is contained in:
Dave Halter committed 2016-01-07 12:30:45 +01:00
commit 8216ff3b11
2 files changed
+22 -1

No files matched your search

+2 -1
View File
@@ -312,7 +312,8 @@ class Evaluator(object):
self.eval_element(element.children[-1]))
elif element.type == 'operator':
# Must be an ellipsis, other operators are not evaluated.
types = set() # Ignore for now.
assert element.value == '...'
types = set([compiled.create(self, Ellipsis)])
elif element.type == 'dotted_name':
types = self._eval_atom(element.children[0])
for next_name in element.children[2::2]: