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

star argument bug fixes.

Browse Source
This commit is contained in:
Dave Halter
2014-12-13 08:37:20 +01:00
parent 7d9f85c762
commit 70e80a5d1c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jedi/evaluate/param.py
View File

@@ -59,14 +59,14 @@ class Arguments(pr.Base):
for stars, el in self._split(): for stars, el in self._split():
if stars == 1: if stars == 1:
arrays = self._evaluator.eval_element(el) arrays = self._evaluator.eval_element(el)
iterators = [_iterate_star_args(self._evaluator, a, None, None) iterators = [_iterate_star_args(self._evaluator, a, el, func)
for a in arrays] for a in arrays]
iterators = list(iterators) iterators = list(iterators)
for values in list(zip_longest(*iterators)): for values in list(zip_longest(*iterators)):
yield None, [v for v in values if v is not None] yield None, [v for v in values if v is not None]
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, func, el) dicts = [_star_star_dict(self._evaluator, a, el, func)
for a in arrays] for a in arrays]
for dct in dicts: for dct in dicts:
for key, values in dct.items(): for key, values in dct.items():
@@ -410,7 +410,7 @@ def _unpack_var_args(evaluator, var_args, func):
return argument_list return argument_list
def _iterate_star_args(evaluator, array, expression_list, func): def _iterate_star_args(evaluator, array, input_node, func=None):
from jedi.evaluate.representation import Instance from jedi.evaluate.representation import Instance
if isinstance(array, iterable.Array): if isinstance(array, iterable.Array):
for field_stmt in array: # yield from plz! for field_stmt in array: # yield from plz!
@@ -421,14 +421,13 @@ def _iterate_star_args(evaluator, array, expression_list, func):
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:
if expression_list: if func is not None:
m = "TypeError: %s() argument after * must be a sequence, not %s" \ m = "TypeError: %s() argument after * must be a sequence, not %s" \
% (func.name.get_code(), array) % (func.name.value, array)
analysis.add(evaluator, 'type-error-star', analysis.add(evaluator, 'type-error-star', input_node, message=m)
expression_list[0], message=m)
def _star_star_dict(evaluator, array, func, input_node): def _star_star_dict(evaluator, array, input_node, func):
dct = defaultdict(lambda: []) dct = defaultdict(lambda: [])
from jedi.evaluate.representation import Instance from jedi.evaluate.representation import Instance
if isinstance(array, Instance) and array.name.get_code() == 'dict': if isinstance(array, Instance) and array.name.get_code() == 'dict':