VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-08 23:04:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove a usage of load_stubs, because we are already using stubs

Browse Source
This commit is contained in:
Dave Halter
2019-05-06 19:48:15 +02:00
parent 5099ef15b4
commit ee86b58ab9
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jedi/evaluate/__init__.py
View File

@@ -80,20 +80,15 @@ from jedi.evaluate.filters import TreeNameDefinition, ParamName
from jedi.evaluate.base_context import ContextualizedName, ContextualizedNode, \ from jedi.evaluate.base_context import ContextualizedName, ContextualizedNode, \
ContextSet, NO_CONTEXTS, iterate_contexts ContextSet, NO_CONTEXTS, iterate_contexts
from jedi.evaluate.context import ClassContext, FunctionContext, \ from jedi.evaluate.context import ClassContext, FunctionContext, \
AnonymousInstance, BoundMethod, MethodContext AnonymousInstance, BoundMethod
from jedi.evaluate.context.iterable import CompForContext from jedi.evaluate.context.iterable import CompForContext
from jedi.evaluate.syntax_tree import eval_trailer, eval_expr_stmt, \ from jedi.evaluate.syntax_tree import eval_trailer, eval_expr_stmt, \
eval_node, check_tuple_assignments eval_node, check_tuple_assignments
from jedi.evaluate.gradual.stub_context import \ from jedi.evaluate.gradual.stub_context import \
stub_to_actual_context_set, goto_with_stubs_if_possible, goto_non_stub, \ stub_to_actual_context_set, goto_with_stubs_if_possible, goto_non_stub
load_stubs
def _execute(context, arguments): def _execute(context, arguments):
if not context.get_root_context().is_stub():
stubs = load_stubs(context)
if stubs:
return stubs.execute(arguments)
try: try:
func = context.py__call__ func = context.py__call__
except AttributeError: except AttributeError:
@@ -182,8 +177,6 @@ class Evaluator(object):
if isinstance(context, CompForContext): if isinstance(context, CompForContext):
return eval_node(context, element) return eval_node(context, element)
#import traceback, sys; traceback.print_stack(file=sys.stdout)
#print(element, id(context), context)
if_stmt = element if_stmt = element
while if_stmt is not None: while if_stmt is not None:
if_stmt = if_stmt.parent if_stmt = if_stmt.parent

2
jedi/evaluate/gradual/stub_context.py
View File

@@ -185,7 +185,7 @@ def _load_or_get_stub_module(evaluator, names):
return evaluator.stub_module_cache.get(names) return evaluator.stub_module_cache.get(names)
def load_stubs(context): def __load_stubs(context): # TODO remove?
root_context = context.get_root_context() root_context = context.get_root_context()
stub_module = _load_or_get_stub_module( stub_module = _load_or_get_stub_module(
context.evaluator, context.evaluator,