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

invalid star star arguments.

Browse Source
This commit is contained in:
Dave Halter
2014-12-13 08:34:03 +01:00
parent ddd4d675f6
commit 7d9f85c762
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jedi/evaluate/param.py
View File

@@ -54,7 +54,7 @@ class Arguments(pr.Base):
default = None default = None
yield argument, default, stars yield argument, default, stars
def unpack(self): def unpack(self, func=None):
named_args = [] named_args = []
for stars, el in self._split(): for stars, el in self._split():
if stars == 1: if stars == 1:
@@ -66,7 +66,7 @@ class Arguments(pr.Base):
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, None, None) dicts = [_star_star_dict(self._evaluator, a, func, el)
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():
@@ -209,7 +209,7 @@ def get_params(evaluator, func, var_args):
param_dict[str(param.get_name())] = param param_dict[str(param.get_name())] = param
# There may be calls, which don't fit all the params, this just ignores it. # There may be calls, which don't fit all the params, this just ignores it.
#unpacked_va = _unpack_var_args(evaluator, var_args, func) #unpacked_va = _unpack_var_args(evaluator, var_args, func)
unpacked_va = list(var_args.unpack()) unpacked_va = list(var_args.unpack(func))
from jedi.evaluate.representation import InstanceElement from jedi.evaluate.representation import InstanceElement
if isinstance(func, InstanceElement): if isinstance(func, InstanceElement):
# Include self at this place. # Include self at this place.
@@ -428,7 +428,7 @@ def _iterate_star_args(evaluator, array, expression_list, func):
expression_list[0], message=m) expression_list[0], message=m)
def _star_star_dict(evaluator, array, expression_list, func): def _star_star_dict(evaluator, array, func, input_node):
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':
@@ -439,17 +439,17 @@ def _star_star_dict(evaluator, array, expression_list, func):
if isinstance(array, iterable.FakeDict): if isinstance(array, iterable.FakeDict):
return array._dct return array._dct
elif isinstance(array, iterable.Array) and array.type == pr.Array.DICT: elif isinstance(array, iterable.Array) and array.type == pr.Array.DICT:
# TODO bad call to non-public API
for key_node, values in array._items(): for key_node, values in array._items():
for key in evaluator.eval_element(key_node): for key in evaluator.eval_element(key_node):
if precedence.is_string(key): if precedence.is_string(key):
dct[key.obj] += values dct[key.obj] += values
else: else:
if expression_list: if func is not None:
m = "TypeError: %s argument after ** must be a mapping, not %s" \ m = "TypeError: %s argument after ** must be a mapping, not %s" \
% (func.name.get_code(), array) % (func.name.value, array)
analysis.add(evaluator, 'type-error-star-star', analysis.add(evaluator, 'type-error-star-star', input_node, message=m)
expression_list[0], message=m)
return dict(dct) return dict(dct)

5
test/static_analysis/star_arguments.py
View File

@@ -108,6 +108,11 @@ mixed2(3, b=5)
#! 12 type-error-star-star #! 12 type-error-star-star
simple(1, **[]) simple(1, **[])
#! 12 type-error-star-star
simple(1, **1)
class A(): pass
#! 12 type-error-star-star
simple(1, **A())
#! 11 type-error-star #! 11 type-error-star
simple(1, *1) simple(1, *1)