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

star arg iteration improved.

Browse Source
This commit is contained in:
Dave Halter
2014-11-23 11:59:20 +01:00
parent f1cbd45575
commit c10ec4f876
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jedi/evaluate/param.py
View File

@@ -58,7 +58,7 @@ class Arguments(pr.Base):
for a in arrays] for a in arrays]
iterators = list(iterators) iterators = list(iterators)
for values in list(zip_longest(*iterators, fillvalue=())): for values in list(zip_longest(*iterators, fillvalue=())):
yield None, tuple(chain.from_iterable(values)) yield None, values
elif stars == 2: elif stars == 2:
arrays = self._evaluator.eval_element(el) arrays = self._evaluator.eval_element(el)
dicts = [_star_star_dict(self._evaluator, a, None, None) dicts = [_star_star_dict(self._evaluator, a, None, None)
@@ -171,11 +171,11 @@ def _get_calling_var_args(evaluator, var_args):
old_var_args = None old_var_args = None
while var_args != old_var_args: while var_args != old_var_args:
old_var_args = var_args old_var_args = var_args
for argument, default, stars in reversed(list(var_args.as_tuple())): for name, default, stars in reversed(list(var_args.as_tuple())):
if not stars or not isinstance(argument, pr.Name): if not stars or not isinstance(name, pr.Name):
continue continue
names = evaluator.goto(argument, [argument.value]) names = evaluator.goto(name)
if len(names) != 1: if len(names) != 1:
break break
param = names[0].get_definition() param = names[0].get_definition()
@@ -400,7 +400,7 @@ def _iterate_star_args(evaluator, array, expression_list, func):
yield field_stmt yield field_stmt
elif isinstance(array, iterable.Generator): elif isinstance(array, iterable.Generator):
for field_stmt in array.iter_content(): for field_stmt in array.iter_content():
yield helpers.FakeStatement([field_stmt]) yield iterable.AlreadyEvaluated([field_stmt])
elif isinstance(array, Instance) and array.name.get_code() == 'tuple': elif isinstance(array, Instance) and array.name.get_code() == 'tuple':
debug.warning('Ignored a tuple *args input %s' % array) debug.warning('Ignored a tuple *args input %s' % array)
else: else: