diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py index c294dc78..5d384aa2 100644 --- a/jedi/evaluate/__init__.py +++ b/jedi/evaluate/__init__.py @@ -84,7 +84,7 @@ from jedi.evaluate.context import ClassContext, FunctionContext, \ from jedi.evaluate.context.iterable import CompForContext from jedi.evaluate.syntax_tree import eval_trailer, eval_expr_stmt, \ eval_node, check_tuple_assignments -from jedi.evaluate.gradual.stub_context import with_stub_context_if_possible, \ +from jedi.evaluate.gradual.stub_context import \ stub_to_actual_context_set, goto_with_stubs_if_possible, goto_non_stub, \ load_stubs @@ -287,7 +287,7 @@ class Evaluator(object): if context.is_stub(): return stub_to_actual_context_set(c) else: - return with_stub_context_if_possible(c) + return ContextSet([c]) if type_ == 'expr_stmt': is_simple_name = name.parent.type not in ('power', 'trailer') diff --git a/jedi/evaluate/gradual/stub_context.py b/jedi/evaluate/gradual/stub_context.py index 5b654613..99bcdb43 100644 --- a/jedi/evaluate/gradual/stub_context.py +++ b/jedi/evaluate/gradual/stub_context.py @@ -255,27 +255,6 @@ def _add_stub_if_possible(parent_context, actual_context, stub_contexts): ) -def with_stub_context_if_possible(actual_context): - return ContextSet([actual_context]) - # XXX - if actual_context.tree_node.type == 'lambdef': - return ContextSet([actual_context]) - assert actual_context.tree_node.type in ('classdef', 'funcdef') - qualified_names = actual_context.get_qualified_names() - stub_module = actual_context.get_root_context().stub_context - if stub_module is None or qualified_names is None: - return ContextSet([actual_context]) - - stub_contexts = ContextSet([stub_module]) - for name in qualified_names: - stub_contexts = stub_contexts.py__getattribute__(name) - return _add_stub_if_possible( - actual_context.parent_context, - actual_context, - stub_contexts, - ) - - def goto_with_stubs_if_possible(name): return [name] # XXX