1
0
forked from VimPlug/jedi

Fix partialmethod issues

This commit is contained in:
Dave Halter
2020-03-14 01:20:10 +01:00
parent fd9a493868
commit 0888dd468f
3 changed files with 27 additions and 11 deletions

View File

@@ -502,9 +502,6 @@ class PartialObject(ValueWrapper):
keys.add(key)
return [PartialSignature(s, arg_count, keys) for s in func.get_signatures()]
def py__get__(self, instance, class_value):
return ValueSet([PartialObject(self._actual_value, self._arguments, self._instance)])
def py__call__(self, arguments):
func = self._get_function(self._arguments.unpack())
if func is None:
@@ -514,6 +511,14 @@ class PartialObject(ValueWrapper):
MergedPartialArguments(self._arguments, arguments, self._instance)
)
def py__get__(self, instance, class_value):
return ValueSet([self])
class PartialMethodObject(PartialObject):
def py__get__(self, instance, class_value):
return ValueSet([PartialObject(self._actual_value, self._arguments, instance)])
class PartialSignature(SignatureWrapper):
def __init__(self, wrapped_signature, skipped_arg_count, skipped_arg_set):
@@ -554,9 +559,7 @@ def functools_partial(value, arguments, callback):
def functools_partialmethod(value, arguments, callback):
return ValueSet(
# XXX last argument is a placeholder. See:
# https://github.com/davidhalter/jedi/pull/1522#discussion_r392474671
PartialObject(instance, arguments, True)
PartialMethodObject(instance, arguments)
for instance in value.py__call__(arguments)
)