Merge branch 'master' into typeshed

2018-08-03 00:26:09 +02:00
parent 5143c71589 1a4be5c91c
commit a3b5247de9
18 changed files with 101 additions and 109 deletions
--- a/jedi/evaluate/base_context.py
+++ b/jedi/evaluate/base_context.py
@@ -168,9 +168,10 @@ def iterate_contexts(contexts, contextualized_node=None, is_async=False):


 class TreeContext(Context):
-    def __init__(self, evaluator, parent_context=None):
+    def __init__(self, evaluator, parent_context, tree_node):
        super(TreeContext, self).__init__(evaluator, parent_context)
        self.predefined_names = {}
+        self.tree_node = tree_node

    def __repr__(self):
        return '<%s: %s>' % (self.__class__.__name__, self.tree_node)