Move base_context -> base_value

docs/docs/development.rst

@@ -73,10 +73,10 @@ Type inference of python code (inference/__init__.py)
 
 .. automodule:: jedi.inference
 
-Inference Contexts (inference/base_context.py)
+Inference Contexts (inference/base_value.py)
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-.. automodule:: jedi.inference.base_context
+.. automodule:: jedi.inference.base_value
 
 .. inheritance-diagram::
    jedi.inference.context.instance.TreeInstance

jedi/api/__init__.py

@@ -37,7 +37,7 @@ from jedi.inference.sys_path import transform_path_to_dotted
 from jedi.inference.names import TreeNameDefinition, ParamName
 from jedi.inference.syntax_tree import tree_name_to_contexts
 from jedi.inference.context import ModuleContext
-from jedi.inference.base_context import ContextSet
+from jedi.inference.base_value import ContextSet
 from jedi.inference.context.iterable import unpack_tuple_to_dict
 from jedi.inference.gradual.conversion import convert_names, convert_contexts
 from jedi.inference.gradual.utils import load_proper_stub_module

jedi/api/classes.py

@@ -17,7 +17,7 @@ from jedi.inference.imports import ImportName
 from jedi.inference.context import FunctionExecutionContext
 from jedi.inference.gradual.typeshed import StubModuleContext
 from jedi.inference.gradual.conversion import convert_names, convert_contexts
-from jedi.inference.base_context import ContextSet
+from jedi.inference.base_value import ContextSet
 from jedi.api.keywords import KeywordName
 
 

jedi/api/helpers.py

@@ -9,7 +9,7 @@ from parso.python.parser import Parser
 from parso.python import tree
 
 from jedi._compatibility import u, Parameter
-from jedi.inference.base_context import NO_CONTEXTS
+from jedi.inference.base_value import NO_CONTEXTS
 from jedi.inference.syntax_tree import infer_atom
 from jedi.inference.helpers import infer_call_of_leaf
 from jedi.inference.compiled import get_string_context_set

jedi/api/interpreter.py

@@ -6,7 +6,7 @@ from jedi.inference.context import ModuleContext
 from jedi.inference import compiled
 from jedi.inference.compiled import mixed
 from jedi.inference.compiled.access import create_access_path
-from jedi.inference.base_context import ContextWrapper
+from jedi.inference.base_value import ContextWrapper
 
 
 def _create(infer_state, obj):

jedi/inference/__init__.py

@@ -75,7 +75,7 @@ from jedi.inference import recursion
 from jedi.inference.cache import infer_state_function_cache
 from jedi.inference import helpers
 from jedi.inference.names import TreeNameDefinition, ParamName
-from jedi.inference.base_context import ContextualizedName, ContextualizedNode, \
+from jedi.inference.base_value import ContextualizedName, ContextualizedNode, \
     ContextSet, NO_CONTEXTS, iterate_contexts
 from jedi.inference.context import ClassContext, FunctionContext, \
     AnonymousInstance, BoundMethod
@@ -368,7 +368,7 @@ class InferState(object):
                 search_global=True, is_goto=True
             )
 
-    def create_context(self, base_context, node, node_is_context=False, node_is_object=False):
+    def create_context(self, base_value, node, node_is_context=False, node_is_object=False):
         def parent_scope(node):
             while True:
                 node = node.parent
@@ -386,7 +386,7 @@ class InferState(object):
 
         def from_scope_node(scope_node, is_nested=True, node_is_object=False):
             if scope_node == base_node:
-                return base_context
+                return base_value
 
             is_funcdef = scope_node.type in ('funcdef', 'lambdef')
             parent_scope = parser_utils.get_parent_scope(scope_node)
@@ -413,7 +413,7 @@ class InferState(object):
                 return CompForContext.from_comp_for(parent_context, scope_node)
             raise Exception("There's a scope that was not managed.")
 
-        base_node = base_context.tree_node
+        base_node = base_value.tree_node
 
         if node_is_context and parser_utils.is_scope(node):
             scope_node = node

jedi/inference/arguments.py

@@ -9,7 +9,7 @@ from jedi.inference import analysis
 from jedi.inference.lazy_context import LazyKnownContext, LazyKnownContexts, \
     LazyTreeContext, get_merged_lazy_context
 from jedi.inference.names import ParamName, TreeNameDefinition
-from jedi.inference.base_context import NO_CONTEXTS, ContextSet, ContextualizedNode
+from jedi.inference.base_value import NO_CONTEXTS, ContextSet, ContextualizedNode
 from jedi.inference.context import iterable
 from jedi.inference.cache import infer_state_as_method_param_cache
 from jedi.inference.param import get_executed_params_and_issues, ExecutedParam

jedi/inference/compiled/__init__.py

@@ -1,7 +1,7 @@
 from jedi._compatibility import unicode
 from jedi.inference.compiled.context import CompiledObject, CompiledName, \
     CompiledObjectFilter, CompiledContextName, create_from_access_path
-from jedi.inference.base_context import ContextWrapper, LazyContextWrapper
+from jedi.inference.base_value import ContextWrapper, LazyContextWrapper
 
 
 def builtin_from_name(infer_state, string):

jedi/inference/compiled/context.py

@@ -11,7 +11,7 @@ from jedi.cache import underscore_memoization, memoize_method
 from jedi.inference.filters import AbstractFilter
 from jedi.inference.names import AbstractNameDefinition, ContextNameMixin, \
     ParamNameInterface
-from jedi.inference.base_context import Context, ContextSet, NO_CONTEXTS
+from jedi.inference.base_value import Context, ContextSet, NO_CONTEXTS
 from jedi.inference.lazy_context import LazyKnownContext
 from jedi.inference.compiled.access import _sentinel
 from jedi.inference.cache import infer_state_function_cache

jedi/inference/compiled/mixed.py

@@ -12,7 +12,7 @@ from jedi import settings
 from jedi.inference import compiled
 from jedi.cache import underscore_memoization
 from jedi.file_io import FileIO
-from jedi.inference.base_context import ContextSet, ContextWrapper
+from jedi.inference.base_value import ContextSet, ContextWrapper
 from jedi.inference.helpers import SimpleGetItemNotFound
 from jedi.inference.context import ModuleContext
 from jedi.inference.cache import infer_state_function_cache

jedi/inference/context/decorator.py

@@ -3,7 +3,7 @@ Decorators are not really contexts, however we need some wrappers to improve
 docstrings and other things around decorators.
 '''
 
-from jedi.inference.base_context import ContextWrapper
+from jedi.inference.base_value import ContextWrapper
 
 
 class Decoratee(ContextWrapper):

jedi/inference/context/function.py

@@ -12,7 +12,7 @@ from jedi.inference.signature import TreeSignature
 from jedi.inference.arguments import AnonymousArguments
 from jedi.inference.filters import ParserTreeFilter, FunctionExecutionFilter
 from jedi.inference.names import ContextName, AbstractNameDefinition, ParamName
-from jedi.inference.base_context import ContextualizedNode, NO_CONTEXTS, \
+from jedi.inference.base_value import ContextualizedNode, NO_CONTEXTS, \
     ContextSet, TreeContext, ContextWrapper
 from jedi.inference.lazy_context import LazyKnownContexts, LazyKnownContext, \
     LazyTreeContext

jedi/inference/context/instance.py

@@ -7,7 +7,7 @@ from jedi.inference.compiled.context import CompiledObjectFilter
 from jedi.inference.helpers import contexts_from_qualified_names
 from jedi.inference.filters import AbstractFilter
 from jedi.inference.names import ContextName, TreeNameDefinition
-from jedi.inference.base_context import Context, NO_CONTEXTS, ContextSet, \
+from jedi.inference.base_value import Context, NO_CONTEXTS, ContextSet, \
     iterator_to_context_set, ContextWrapper
 from jedi.inference.lazy_context import LazyKnownContext, LazyKnownContexts
 from jedi.inference.cache import infer_state_method_cache

jedi/inference/context/iterable.py

@@ -37,7 +37,7 @@ from jedi.inference.utils import safe_property, to_list
 from jedi.inference.cache import infer_state_method_cache
 from jedi.inference.filters import ParserTreeFilter, LazyAttributeOverwrite, \
     publish_method
-from jedi.inference.base_context import ContextSet, Context, NO_CONTEXTS, \
+from jedi.inference.base_value import ContextSet, Context, NO_CONTEXTS, \
     TreeContext, ContextualizedNode, iterate_contexts, HelperContextMixin, _sentinel
 from jedi.parser_utils import get_sync_comp_fors
 

jedi/inference/context/klass.py

@@ -46,7 +46,7 @@ from jedi.inference.lazy_context import LazyKnownContexts
 from jedi.inference.filters import ParserTreeFilter
 from jedi.inference.names import TreeNameDefinition, ContextName
 from jedi.inference.arguments import unpack_arglist, ValuesArguments
-from jedi.inference.base_context import ContextSet, iterator_to_context_set, \
+from jedi.inference.base_value import ContextSet, iterator_to_context_set, \
     NO_CONTEXTS
 from jedi.inference.context.function import FunctionAndClassBase
 from jedi.plugins import plugin_manager

jedi/inference/context/module.py

@@ -6,11 +6,11 @@ from jedi.inference.cache import infer_state_method_cache
 from jedi.inference.names import ContextNameMixin, AbstractNameDefinition
 from jedi.inference.filters import GlobalNameFilter, ParserTreeFilter, DictFilter, MergedFilter
 from jedi.inference import compiled
-from jedi.inference.base_context import TreeContext
+from jedi.inference.base_value import TreeContext
 from jedi.inference.names import SubModuleName
 from jedi.inference.helpers import contexts_from_qualified_names
 from jedi.inference.compiled import create_simple_object
-from jedi.inference.base_context import ContextSet
+from jedi.inference.base_value import ContextSet
 
 
 class _ModuleAttributeName(AbstractNameDefinition):

jedi/inference/context/namespace.py

@@ -1,7 +1,7 @@
 from jedi.inference.cache import infer_state_method_cache
 from jedi.inference.filters import DictFilter
 from jedi.inference.names import ContextNameMixin, AbstractNameDefinition
-from jedi.inference.base_context import Context
+from jedi.inference.base_value import Context
 from jedi.inference.context.module import SubModuleDictMixin
 
 

jedi/inference/docstrings.py

@@ -25,7 +25,7 @@ from jedi._compatibility import u
 from jedi import debug
 from jedi.inference.utils import indent_block
 from jedi.inference.cache import infer_state_method_cache
-from jedi.inference.base_context import iterator_to_context_set, ContextSet, \
+from jedi.inference.base_value import iterator_to_context_set, ContextSet, \
     NO_CONTEXTS
 from jedi.inference.lazy_context import LazyKnownContexts
 

jedi/inference/dynamic.py

@@ -27,7 +27,7 @@ from jedi.inference.helpers import is_stdlib_path
 from jedi.inference.utils import to_list
 from jedi.parser_utils import get_parent_scope
 from jedi.inference.context import ModuleContext, instance
-from jedi.inference.base_context import ContextSet, NO_CONTEXTS
+from jedi.inference.base_value import ContextSet, NO_CONTEXTS
 from jedi.inference import recursion
 
 

jedi/inference/filters.py

@@ -9,7 +9,7 @@ from parso.tree import search_ancestor
 
 from jedi._compatibility import use_metaclass
 from jedi.inference import flow_analysis
-from jedi.inference.base_context import ContextSet, Context, ContextWrapper, \
+from jedi.inference.base_value import ContextSet, Context, ContextWrapper, \
     LazyContextWrapper
 from jedi.parser_utils import get_cached_parent_scope
 from jedi.inference.utils import to_list

jedi/inference/finder.py

@@ -27,7 +27,7 @@ from jedi.inference import helpers
 from jedi.inference.context import iterable
 from jedi.inference.filters import get_global_filters
 from jedi.inference.names import TreeNameDefinition
-from jedi.inference.base_context import ContextSet, NO_CONTEXTS
+from jedi.inference.base_value import ContextSet, NO_CONTEXTS
 from jedi.parser_utils import is_scope, get_parent_scope
 from jedi.inference.gradual.conversion import convert_contexts
 

jedi/inference/gradual/annotation.py

@@ -11,7 +11,7 @@ from parso import ParserSyntaxError, parse
 
 from jedi._compatibility import force_unicode
 from jedi.inference.cache import infer_state_method_cache
-from jedi.inference.base_context import ContextSet, NO_CONTEXTS
+from jedi.inference.base_value import ContextSet, NO_CONTEXTS
 from jedi.inference.gradual.typing import TypeVar, LazyGenericClass, \
     AbstractAnnotatedClass
 from jedi.inference.gradual.typing import GenericClass

jedi/inference/gradual/conversion.py

@@ -1,5 +1,5 @@
 from jedi import debug
-from jedi.inference.base_context import ContextSet, \
+from jedi.inference.base_value import ContextSet, \
     NO_CONTEXTS
 from jedi.inference.utils import to_list
 from jedi.inference.gradual.stub_context import StubModuleContext

jedi/inference/gradual/stub_context.py

@@ -1,4 +1,4 @@
-from jedi.inference.base_context import ContextWrapper
+from jedi.inference.base_value import ContextWrapper
 from jedi.inference.context.module import ModuleContext
 from jedi.inference.filters import ParserTreeFilter, \
     TreeNameDefinition

jedi/inference/gradual/typeshed.py

@@ -5,7 +5,7 @@ from functools import wraps
 from jedi.file_io import FileIO
 from jedi._compatibility import FileNotFoundError, cast_path
 from jedi.parser_utils import get_cached_code_lines
-from jedi.inference.base_context import ContextSet, NO_CONTEXTS
+from jedi.inference.base_value import ContextSet, NO_CONTEXTS
 from jedi.inference.gradual.stub_context import TypingModuleWrapper, StubModuleContext
 
 _jedi_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

jedi/inference/gradual/typing.py

@@ -9,7 +9,7 @@ from jedi._compatibility import unicode, force_unicode
 from jedi import debug
 from jedi.inference.cache import infer_state_method_cache
 from jedi.inference.compiled import builtin_from_name
-from jedi.inference.base_context import ContextSet, NO_CONTEXTS, Context, \
+from jedi.inference.base_value import ContextSet, NO_CONTEXTS, Context, \
     iterator_to_context_set, ContextWrapper, LazyContextWrapper
 from jedi.inference.lazy_context import LazyKnownContexts
 from jedi.inference.context.iterable import SequenceLiteralContext

jedi/inference/imports.py

@@ -30,7 +30,7 @@ from jedi.inference import analysis
 from jedi.inference.utils import unite
 from jedi.inference.cache import infer_state_method_cache
 from jedi.inference.names import ImportName, SubModuleName
-from jedi.inference.base_context import ContextSet, NO_CONTEXTS
+from jedi.inference.base_value import ContextSet, NO_CONTEXTS
 from jedi.inference.gradual.typeshed import import_module_decorator
 from jedi.inference.context.module import iter_module_names
 from jedi.plugins import plugin_manager

jedi/inference/lazy_context.py

@@ -1,4 +1,4 @@
-from jedi.inference.base_context import ContextSet, NO_CONTEXTS
+from jedi.inference.base_value import ContextSet, NO_CONTEXTS
 from jedi.common.utils import monkeypatch
 
 

jedi/inference/names.py

@@ -3,7 +3,7 @@ from abc import abstractmethod
 from parso.tree import search_ancestor
 
 from jedi._compatibility import Parameter
-from jedi.inference.base_context import ContextSet, NO_CONTEXTS
+from jedi.inference.base_value import ContextSet, NO_CONTEXTS
 from jedi.cache import memoize_method
 
 

jedi/inference/recursion.py

@@ -29,7 +29,7 @@ therefore the quality might not always be maximal.
 from contextlib import contextmanager
 
 from jedi import debug
-from jedi.inference.base_context import NO_CONTEXTS
+from jedi.inference.base_value import NO_CONTEXTS
 
 
 recursion_limit = 15

jedi/inference/syntax_tree.py

@@ -8,7 +8,7 @@ from parso.python import tree
 from jedi._compatibility import force_unicode, unicode
 from jedi import debug
 from jedi import parser_utils
-from jedi.inference.base_context import ContextSet, NO_CONTEXTS, ContextualizedNode, \
+from jedi.inference.base_value import ContextSet, NO_CONTEXTS, ContextualizedNode, \
     ContextualizedName, iterator_to_context_set, iterate_contexts
 from jedi.inference.lazy_context import LazyTreeContext
 from jedi.inference import compiled

jedi/inference/sys_path.py

@@ -2,7 +2,7 @@ import os
 
 from jedi._compatibility import unicode, force_unicode, all_suffixes
 from jedi.inference.cache import infer_state_method_cache
-from jedi.inference.base_context import ContextualizedNode
+from jedi.inference.base_value import ContextualizedNode
 from jedi.inference.helpers import is_string
 from jedi.common.utils import traverse_parents
 from jedi.parser_utils import get_cached_code_lines

jedi/plugins/stdlib.py

@@ -21,7 +21,7 @@ from jedi.inference.arguments import ValuesArguments, \
 from jedi.inference import analysis
 from jedi.inference import compiled
 from jedi.inference.context.instance import BoundMethod, InstanceArguments
-from jedi.inference.base_context import ContextualizedNode, \
+from jedi.inference.base_value import ContextualizedNode, \
     NO_CONTEXTS, ContextSet, ContextWrapper, LazyContextWrapper
 from jedi.inference.context import ClassContext, ModuleContext, \
     FunctionExecutionContext