From ca536baf9bc09ca07b2bef1c6b0173e4b1fc3ed8 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sat, 6 Sep 2014 13:23:00 +0200 Subject: [PATCH] Last fixes, because of the Name.get_definition change. The recent parser.representation changes are now fully working and we're ready to improve Evaluator.goto again. --- jedi/evaluate/param.py | 2 +- test/test_api/test_api.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jedi/evaluate/param.py b/jedi/evaluate/param.py index b019e535..64711a19 100644 --- a/jedi/evaluate/param.py +++ b/jedi/evaluate/param.py @@ -46,7 +46,7 @@ def _get_calling_var_args(evaluator, var_args): names = evaluator.goto(argument, [exp_list[1].get_code()]) if len(names) != 1: break - param = names[0].parent + param = names[0].get_definition() if not isinstance(param, ExecutedParam): if isinstance(param, pr.Param): # There is no calling var_args in this case - there's just diff --git a/test/test_api/test_api.py b/test/test_api/test_api.py index 7890b8c5..0e5c0ac7 100644 --- a/test/test_api/test_api.py +++ b/test/test_api/test_api.py @@ -130,5 +130,5 @@ def test_goto_definition_not_multiple(): def test_usage_description(): - for u in api.Script('foo = ''; foo').usages(): - assert u.description == 'foo' + descs = [u.description for u in api.Script("foo = ''; foo").usages()] + assert set(descs) == {"foo = ''", 'foo'}