1
0
forked from VimPlug/jedi

Move get_node() to tree_node and replace all the custom classdefs/funcdefs.

This commit is contained in:
Dave Halter
2017-01-05 23:43:12 +01:00
parent b44f0aae5d
commit ae8e43d3c7
24 changed files with 90 additions and 99 deletions

View File

@@ -56,7 +56,7 @@ class CompiledObject(Context):
super(CompiledObject, self).__init__(evaluator, parent_context)
self.obj = obj
# This attribute will not be set for most classes, except for fakes.
self.classdef = faked_class
self.tree_node = faked_class
def get_root_node(self):
# To make things a bit easier with filters we add this method here.

View File

@@ -190,9 +190,9 @@ def _get_faked(module, obj, name=None):
def get_faked(evaluator, module, obj, name=None, parent_context=None):
if parent_context and parent_context.classdef is not None:
if parent_context and parent_context.tree_node is not None:
# Try to search in already clearly defined stuff.
found = _search_scope(parent_context.classdef, name)
found = _search_scope(parent_context.tree_node, name)
if found is not None:
return found
else:

View File

@@ -36,7 +36,7 @@ class MixedObject(object):
self.obj = compiled_object.obj
self._tree_name = tree_name
name_module = tree_name.get_root_node()
if parent_context.get_node().get_root_node() != name_module:
if parent_context.tree_node.get_root_node() != name_module:
from jedi.evaluate.representation import ModuleContext
module_context = ModuleContext(evaluator, name_module)
name = compiled_object.get_root_context().py__name__()