From 87fd56859d7618191fc66dc55220dbf2fbbe1479 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sun, 5 May 2019 16:02:18 +0200 Subject: [PATCH] Remove stubify --- jedi/evaluate/__init__.py | 8 ++------ jedi/evaluate/gradual/stub_context.py | 13 ------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py index aeff3555..c294dc78 100644 --- a/jedi/evaluate/__init__.py +++ b/jedi/evaluate/__init__.py @@ -86,7 +86,7 @@ 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, \ stub_to_actual_context_set, goto_with_stubs_if_possible, goto_non_stub, \ - stubify, load_stubs + load_stubs def _execute(context, arguments): @@ -446,7 +446,6 @@ class Evaluator(object): self, parent_context.parent_context, parent_context) func = FunctionContext.from_context(parent_context, scope_node) - func = next(iter(stubify(parent_context, func))) if parent_was_class: func = BoundMethod( @@ -457,10 +456,7 @@ class Evaluator(object): return func.get_function_execution() return func elif scope_node.type == 'classdef': - return next(iter(stubify( - parent_context, - ClassContext(self, parent_context, scope_node) - ))) + return ClassContext(self, parent_context, scope_node) elif scope_node.type == 'comp_for': if node.start_pos >= scope_node.children[-1].start_pos: return parent_context diff --git a/jedi/evaluate/gradual/stub_context.py b/jedi/evaluate/gradual/stub_context.py index 0239a4d6..5b654613 100644 --- a/jedi/evaluate/gradual/stub_context.py +++ b/jedi/evaluate/gradual/stub_context.py @@ -368,19 +368,6 @@ def try_stub_to_actual_names(names, prefer_stub_to_compiled=False): yield name -def stubify(parent_context, context): - if parent_context.is_stub(): - return ContextSet([context]) - # XXX - return ContextSet( - c.stub_context - for c in stub_to_actual_context_set(context) - if c.stub_context is not None - ) or ContextSet([context]) - else: - return with_stub_context_if_possible(context) - - def _load_or_get_stub_module(evaluator, names): return evaluator.stub_module_cache.get(names)