VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Move execute_evaluated to HelperContextMixin

Browse Source
This commit is contained in:
Dave Halter
2019-06-11 17:42:09 +02:00
parent f672d3329a
commit 78973a9f35
8 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/evaluate/compiled/__init__.py
View File

@@ -2,7 +2,6 @@ from jedi._compatibility import unicode
from jedi.evaluate.compiled.context import CompiledObject, CompiledName, \
CompiledObjectFilter, CompiledContextName, create_from_access_path
from jedi.evaluate.base_context import ContextWrapper
from jedi.evaluate.helpers import execute_evaluated
def builtin_from_name(evaluator, string):
@@ -47,7 +46,7 @@ def create_simple_object(evaluator, obj):
def get_string_context_set(evaluator):
return execute_evaluated(builtin_from_name(evaluator, u'str'))
return builtin_from_name(evaluator, u'str').execute_evaluated()
def load_module(evaluator, dotted_name, **kwargs):

4
jedi/evaluate/compiled/context.py
View File

@@ -15,7 +15,7 @@ from jedi.evaluate.base_context import Context, ContextSet, NO_CONTEXTS
from jedi.evaluate.lazy_context import LazyKnownContext
from jedi.evaluate.compiled.access import _sentinel
from jedi.evaluate.cache import evaluator_function_cache
from jedi.evaluate.helpers import reraise_getitem_errors, execute_evaluated
from jedi.evaluate.helpers import reraise_getitem_errors
from jedi.evaluate.signature import BuiltinSignature
@@ -318,7 +318,7 @@ class SignatureParamName(AbstractNameDefinition, ParamNameInterface):
contexts = ContextSet([create_from_access_path(evaluator, p.default)])
if p.has_annotation:
annotation = create_from_access_path(evaluator, p.annotation)
contexts |= execute_evaluated(annotation)
contexts |= annotation.execute_evaluated()
return contexts