Merge branch 'master' into typeshed

2018-08-06 12:49:51 +02:00
parent 49eae5b6f8 8fc2add242
commit 97c9aca245
13 changed files with 109 additions and 122 deletions
--- a/jedi/evaluate/syntax_tree.py
+++ b/jedi/evaluate/syntax_tree.py
@@ -278,7 +278,7 @@ def eval_expr_stmt(context, stmt, seek_name=None):
        # necessary.
        if not allowed and context.get_root_context() == context.evaluator.builtins_module:
            try:
-                instance = context.instance
+                instance = context.var_args.instance
            except AttributeError:
                pass
            else: