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

In parso params is now get_params().

Browse Source
This commit is contained in:
Dave Halter
2017-08-06 17:35:05 +02:00
parent 39cbd003c0
commit ff001e07a6
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/evaluate/dynamic.py
View File

@@ -86,7 +86,7 @@ def search_params(evaluator, execution_context, funcdef):
params = [MergedExecutedParams(executed_params) for executed_params in zipped_params] params = [MergedExecutedParams(executed_params) for executed_params in zipped_params]
# Evaluate the ExecutedParams to types. # Evaluate the ExecutedParams to types.
else: else:
params = [create_default_param(execution_context, p) for p in funcdef.params] params = [create_default_param(execution_context, p) for p in funcdef.get_params()]
debug.dbg('Dynamic param result finished', color='MAGENTA') debug.dbg('Dynamic param result finished', color='MAGENTA')
return params return params
finally: finally:

11
jedi/evaluate/param.py
View File

@@ -236,7 +236,7 @@ def get_params(execution_context, var_args):
funcdef = execution_context.tree_node funcdef = execution_context.tree_node
parent_context = execution_context.parent_context parent_context = execution_context.parent_context
for param in funcdef.params: for param in funcdef.get_params():
param_dict[param.name.value] = param param_dict[param.name.value] = param
unpacked_va = list(var_args.unpack(funcdef)) unpacked_va = list(var_args.unpack(funcdef))
var_arg_iterator = common.PushBackIterator(iter(unpacked_va)) var_arg_iterator = common.PushBackIterator(iter(unpacked_va))
@@ -245,7 +245,7 @@ def get_params(execution_context, var_args):
keys_used = {} keys_used = {}
keys_only = False keys_only = False
had_multiple_value_error = False had_multiple_value_error = False
for param in funcdef.params: for param in funcdef.get_params():
# The value and key can both be null. There, the defaults apply. # The value and key can both be null. There, the defaults apply.
# args / kwargs will just be empty arrays / dicts, respectively. # args / kwargs will just be empty arrays / dicts, respectively.
# Wrong value count is just ignored. If you try to test cases that are # Wrong value count is just ignored. If you try to test cases that are
@@ -381,14 +381,15 @@ def _star_star_dict(context, array, input_node, funcdef):
def _error_argument_count(funcdef, actual_count): def _error_argument_count(funcdef, actual_count):
default_arguments = sum(1 for p in funcdef.params if p.default or p.star_count) params = funcdef.get_params()
default_arguments = sum(1 for p in params if p.default or p.star_count)
if default_arguments == 0: if default_arguments == 0:
before = 'exactly ' before = 'exactly '
else: else:
before = 'from %s to ' % (len(funcdef.params) - default_arguments) before = 'from %s to ' % (len(params) - default_arguments)
return ('TypeError: %s() takes %s%s arguments (%s given).' return ('TypeError: %s() takes %s%s arguments (%s given).'
% (funcdef.name, before, len(funcdef.params), actual_count)) % (funcdef.name, before, len(params), actual_count))
def create_default_param(execution_context, param): def create_default_param(execution_context, param):

2
jedi/evaluate/pep0484.py
View File

@@ -94,7 +94,7 @@ def py__annotations__(funcdef):
dct = {'return': return_annotation} dct = {'return': return_annotation}
else: else:
dct = {} dct = {}
for function_param in funcdef.params: for function_param in funcdef.get_params():
param_annotation = function_param.annotation param_annotation = function_param.annotation
if param_annotation is not None: if param_annotation is not None:
dct[function_param.name.value] = param_annotation dct[function_param.name.value] = param_annotation

5
jedi/evaluate/representation.py
View File

@@ -170,7 +170,7 @@ class ClassContext(use_metaclass(CachedMetaClass, context.TreeContext)):
def get_params(self): def get_params(self):
from jedi.evaluate.instance import AnonymousInstance from jedi.evaluate.instance import AnonymousInstance
anon = AnonymousInstance(self.evaluator, self.parent_context, self) anon = AnonymousInstance(self.evaluator, self.parent_context, self)
return [AnonymousInstanceParamName(anon, param.name) for param in self.funcdef.params] return [AnonymousInstanceParamName(anon, param.name) for param in self.funcdef.get_params()]
def get_filters(self, search_global, until_position=None, origin_scope=None, is_instance=False): def get_filters(self, search_global, until_position=None, origin_scope=None, is_instance=False):
if search_global: if search_global:
@@ -291,7 +291,8 @@ class FunctionContext(use_metaclass(CachedMetaClass, context.TreeContext)):
def get_param_names(self): def get_param_names(self):
function_execution = self.get_function_execution() function_execution = self.get_function_execution()
return [ParamName(function_execution, param.name) for param in self.tree_node.params] return [ParamName(function_execution, param.name)
for param in self.tree_node.get_params()]
class FunctionExecutionContext(context.TreeContext): class FunctionExecutionContext(context.TreeContext):

2
jedi/parser_utils.py
View File

@@ -155,7 +155,7 @@ def get_call_signature(funcdef, width=72, call_string=None):
else: else:
call_string = funcdef.name.value call_string = funcdef.name.value
if funcdef.type == 'lambdef': if funcdef.type == 'lambdef':
p = '(' + ''.join(param.get_code() for param in funcdef.params).strip() + ')' p = '(' + ''.join(param.get_code() for param in funcdef.get_params()).strip() + ')'
else: else:
p = funcdef.children[2].get_code() p = funcdef.children[2].get_code()
code = call_string + p code = call_string + p