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

Fix some small issues

Browse Source
This commit is contained in:
Dave Halter
2018-09-16 14:31:55 +02:00
parent 5d9f29743c
commit 1107967f76
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/evaluate/base_context.py
View File

@@ -18,6 +18,8 @@ from jedi.evaluate.cache import evaluator_as_method_param_cache
class HelperContextMixin: class HelperContextMixin:
tree_node = None
@classmethod @classmethod
@evaluator_as_method_param_cache() @evaluator_as_method_param_cache()
def create_cached(cls, *args, **kwargs): def create_cached(cls, *args, **kwargs):
@@ -63,9 +65,7 @@ class Context(HelperContextMixin, BaseContext):
""" """
Should be defined, otherwise the API returns empty types. Should be defined, otherwise the API returns empty types.
""" """
predefined_names = {} predefined_names = {}
tree_node = None
""" """
To be defined by subclasses. To be defined by subclasses.
""" """

7
jedi/evaluate/context/typing.py
View File

@@ -6,7 +6,8 @@ contexts.
from jedi import debug from jedi import debug
from jedi.evaluate.cache import evaluator_method_cache from jedi.evaluate.cache import evaluator_method_cache
from jedi.evaluate.compiled import builtin_from_name, CompiledObject from jedi.evaluate.compiled import builtin_from_name, CompiledObject
from jedi.evaluate.base_context import ContextSet, NO_CONTEXTS, Context, iterator_to_context_set from jedi.evaluate.base_context import ContextSet, NO_CONTEXTS, Context, \
iterator_to_context_set, HelperContextMixin
from jedi.evaluate.lazy_context import LazyKnownContexts, LazyKnownContext from jedi.evaluate.lazy_context import LazyKnownContexts, LazyKnownContext
from jedi.evaluate.context.iterable import SequenceLiteralContext from jedi.evaluate.context.iterable import SequenceLiteralContext
from jedi.evaluate.arguments import repack_with_argument_clinic, unpack_arglist from jedi.evaluate.arguments import repack_with_argument_clinic, unpack_arglist
@@ -62,7 +63,7 @@ class _BaseTypingContext(Context):
@property @property
def name(self): def name(self):
return ContextName(self, self.tree_name) return ContextName(self, self._tree_name)
def __repr__(self): def __repr__(self):
return '%s(%s)' % (self.__class__.__name__, self._tree_name.value) return '%s(%s)' % (self.__class__.__name__, self._tree_name.value)
@@ -225,7 +226,7 @@ def _iter_over_arguments(maybe_tuple_context, defining_context):
yield ContextSet.from_iterable(resolve_forward_references(context_set)) yield ContextSet.from_iterable(resolve_forward_references(context_set))
class TypeAlias(object): class TypeAlias(HelperContextMixin):
def __init__(self, evaluator, parent_context, origin_tree_name, actual): def __init__(self, evaluator, parent_context, origin_tree_name, actual):
self.evaluator = evaluator self.evaluator = evaluator
self.parent_context = parent_context self.parent_context = parent_context

2
jedi/evaluate/pep0484.py
View File

@@ -452,8 +452,6 @@ def find_annotation_variables(context, node):
for subscript_node in _unpack_subscriptlist(trailer.children[1]): for subscript_node in _unpack_subscriptlist(trailer.children[1]):
type_var_set = context.eval_node(subscript_node) type_var_set = context.eval_node(subscript_node)
for type_var in type_var_set: for type_var in type_var_set:
from jedi.evaluate.context.typing import TypeVar
if isinstance(type_var, TypeVar) and type_var not in found: if isinstance(type_var, TypeVar) and type_var not in found:
found.append(type_var) found.append(type_var)
return found return found