VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-01-28 05:32:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge with the linter branch (especially the changes of pep484.

Browse Source
This commit is contained in:
Dave Halter
2016-06-07 13:51:25 +02:00
parent ed152e440e 9c0f3f9535
commit 82c76fa689
27 changed files with 883 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jedi/evaluate/__init__.py
View File

@@ -292,7 +292,7 @@ class Evaluator(object):
types = set([element]) # TODO this is no real evaluation.
elif element.type == 'expr_stmt':
types = self.eval_statement(element)
elif element.type == 'power':
elif element.type in ('power', 'atom_expr'):
types = self._eval_atom(element.children[0])
for trailer in element.children[1:]:
if trailer == '**': # has a power operation.
@@ -392,8 +392,7 @@ class Evaluator(object):
new_types = set()
if trailer_op == '[':
for trailer_typ in iterable.create_index_types(self, node):
new_types |= iterable.py__getitem__(self, types, trailer_typ, trailer_op)
new_types |= iterable.py__getitem__(self, types, trailer)
else:
for typ in types:
debug.dbg('eval_trailer: %s in scope %s', trailer, typ)