Move execute_evaluated to a helper function

jedi/evaluate/compiled/__init__.py

@@ -2,6 +2,7 @@ from jedi._compatibility import unicode
 from jedi.evaluate.compiled.context import CompiledObject, CompiledName, \
     CompiledObjectFilter, CompiledContextName, create_from_access_path, \
     create_from_name
+from jedi.evaluate.helpers import execute_evaluated
 
 
 def builtin_from_name(evaluator, string):
@@ -29,7 +30,7 @@ def get_special_object(evaluator, identifier):
 
 
 def get_string_context_set(evaluator):
-    return builtin_from_name(evaluator, u'str').execute_evaluated()
+    return execute_evaluated(builtin_from_name(evaluator, u'str'))
 
 
 def load_module(evaluator, **kwargs):

jedi/evaluate/compiled/context.py

@@ -13,7 +13,7 @@ from jedi.evaluate.base_context import Context, ContextSet
 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_as_evaluator
+from jedi.evaluate.helpers import reraise_as_evaluator, execute_evaluated
 from . import fake
 
 
@@ -268,7 +268,7 @@ class SignatureParamName(AbstractNameDefinition):
             contexts = ContextSet(create_from_access_path(evaluator, p.default))
         if p.has_annotation:
             annotation = create_from_access_path(evaluator, p.annotation)
-            contexts |= annotation.execute_evaluated()
+            contexts |= execute_evaluated(annotation)
         return contexts
 
 

jedi/evaluate/compiled/mixed.py

@@ -14,6 +14,7 @@ from jedi.evaluate import imports
 from jedi.evaluate.base_context import Context, ContextSet
 from jedi.evaluate.context import ModuleContext
 from jedi.evaluate.cache import evaluator_function_cache
+from jedi.evaluate.helpers import execute_evaluated
 from jedi.evaluate.compiled.getattr_static import getattr_static
 from jedi.evaluate.compiled.access import compiled_objects_cache
 from jedi.evaluate.compiled.context import create_cached_compiled_object
@@ -220,7 +221,7 @@ def _create(evaluator, access_handle, parent_context, *args):
     if tree_node.type == 'classdef':
         if not access_handle.is_class():
             # Is an instance, not a class.
-            tree_context, = tree_context.execute_evaluated()
+            tree_context, = execute_evaluated(tree_context)
 
     return MixedObject(
         evaluator,