Merge branch 'master' into virtualenv

2017-12-18 01:41:29 +01:00
parent 46b62b7bed f37089e54b
commit 5f2b49d039
13 changed files with 47 additions and 12 deletions
--- a/jedi/evaluate/init.py
+++ b/jedi/evaluate/init.py
@@ -258,6 +258,8 @@ class Evaluator(object):
                else:
                    i = trailer.parent.children.index(trailer)
                    to_evaluate = trailer.parent.children[:i]
+                    if to_evaluate[0] == 'await':
+                        to_evaluate.pop(0)
                    context_set = context.eval_node(to_evaluate[0])
                    for trailer in to_evaluate[1:]:
                        context_set = eval_trailer(context, context_set, trailer)