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

Remove class_context from BoundMethod, it's not really needed anymore

Browse Source
This commit is contained in:
Dave Halter
2018-11-23 00:11:39 +01:00
parent 55982d699b
commit 12a0357f6b
3 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jedi/evaluate/__init__.py
View File

@@ -389,7 +389,6 @@ class Evaluator(object):
if isinstance(parent_context, AnonymousInstance): if isinstance(parent_context, AnonymousInstance):
func = BoundMethod( func = BoundMethod(
instance=parent_context, instance=parent_context,
klass=parent_context.class_context,
function=func function=func
) )
if is_nested and not node_is_object: if is_nested and not node_is_object:

2
jedi/evaluate/context/function.py
View File

@@ -59,7 +59,7 @@ class FunctionMixin(object):
if instance is None: if instance is None:
# Calling the Foo.bar results in the original bar function. # Calling the Foo.bar results in the original bar function.
return ContextSet([self]) return ContextSet([self])
return ContextSet([BoundMethod(instance, class_context, self)]) return ContextSet([BoundMethod(instance, self)])
def get_param_names(self): def get_param_names(self):
function_execution = self.get_function_execution() function_execution = self.get_function_execution()

22
jedi/evaluate/context/instance.py
View File

@@ -186,7 +186,7 @@ class AbstractInstanceContext(Context):
self.parent_context, self.parent_context,
name.tree_name.parent name.tree_name.parent
) )
bound_method = BoundMethod(self, name.class_context, function) bound_method = BoundMethod(self, function)
yield bound_method.get_function_execution(self.var_args) yield bound_method.get_function_execution(self.var_args)
@evaluator_method_cache() @evaluator_method_cache()
@@ -203,7 +203,7 @@ class AbstractInstanceContext(Context):
parent_context, parent_context,
scope, scope,
) )
bound_method = BoundMethod(self, class_context, func) bound_method = BoundMethod(self, func)
if scope.name.value == '__init__' and parent_context == class_context: if scope.name.value == '__init__' and parent_context == class_context:
return bound_method.get_function_execution(self.var_args) return bound_method.get_function_execution(self.var_args)
else: else:
@@ -277,12 +277,7 @@ class TreeInstance(AbstractInstanceContext):
for func in self._get_annotation_init_functions(): for func in self._get_annotation_init_functions():
# Just take the first result, it should always be one, because we # Just take the first result, it should always be one, because we
# control the typeshed code. # control the typeshed code.
c = self.class_context bound = BoundMethod(self, func)
try:
c = func.class_context
except AttributeError:
pass
bound = BoundMethod(self, c, func)
execution = bound.get_function_execution(self.var_args) execution = bound.get_function_execution(self.var_args)
if not execution.matches_signature(): if not execution.matches_signature():
# First check if the signature even matches, if not we don't # First check if the signature even matches, if not we don't
@@ -337,11 +332,7 @@ class CompiledInstanceName(compiled.CompiledName):
@iterator_to_context_set @iterator_to_context_set
def infer(self): def infer(self):
for result_context in self._class_member_name.infer(): for result_context in self._class_member_name.infer():
is_function = result_context.api_type == 'function' if result_context.api_type == 'function':
if result_context.tree_node is not None and is_function:
yield BoundMethod(self._instance, self._class, result_context)
else:
if is_function:
yield CompiledBoundMethod(result_context) yield CompiledBoundMethod(result_context)
else: else:
yield result_context yield result_context
@@ -370,10 +361,9 @@ class CompiledInstanceClassFilter(filters.AbstractFilter):
class BoundMethod(FunctionMixin, ContextWrapper): class BoundMethod(FunctionMixin, ContextWrapper):
def __init__(self, instance, klass, function): def __init__(self, instance, function):
super(BoundMethod, self).__init__(function) super(BoundMethod, self).__init__(function)
self.instance = instance self.instance = instance
self.class_context = klass
def py__class__(self): def py__class__(self):
return compiled.get_special_object(self.evaluator, u'BOUND_METHOD_CLASS') return compiled.get_special_object(self.evaluator, u'BOUND_METHOD_CLASS')
@@ -418,7 +408,7 @@ class BoundMethod(FunctionMixin, ContextWrapper):
if func is self: if func is self:
yield self yield self
else: else:
yield BoundMethod(self.instance, self.class_context, func) yield BoundMethod(self.instance, func)
def get_signatures(self): def get_signatures(self):
return [sig.bind(self) for sig in self._wrapped_context.get_signatures()] return [sig.bind(self) for sig in self._wrapped_context.get_signatures()]