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

Use MethodContext in create_context

Browse Source
This commit is contained in:
Dave Halter
2019-04-14 00:17:14 +02:00
parent 3c74b9bf10
commit ad0000886d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/__init__.py
+7 -6
View File
@@ -80,7 +80,7 @@ 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 AnonymousInstance, BoundMethod, MethodContext
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
@@ -434,15 +434,16 @@ class Evaluator(object):
parent_context = from_scope_node(parent_scope) parent_context = from_scope_node(parent_scope)
if is_funcdef: if is_funcdef:
parent_was_class = isinstance(parent_context, ClassContext) parent_was_class = parent_context.is_class()
if parent_was_class: if parent_was_class:
parent_context = AnonymousInstance( parent_context = AnonymousInstance(
self, parent_context.parent_context, parent_context) self, parent_context.parent_context, parent_context)
cls = MethodContext
else:
cls = FunctionContext
func = cls.from_context(parent_context, scope_node)
func = FunctionContext.from_context(
parent_context,
scope_node
)
if parent_was_class: if parent_was_class:
func = BoundMethod( func = BoundMethod(
instance=parent_context, instance=parent_context,