From 1d71b251098a8a275480dd1d180dc47b1853f188 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Mon, 22 Sep 2014 23:24:29 +0200 Subject: [PATCH] Previously forgot to add the NameParts to used_names. (which had worked before that) --- jedi/evaluate/helpers.py | 5 ++--- jedi/parser/__init__.py | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jedi/evaluate/helpers.py b/jedi/evaluate/helpers.py index 3864d590..2ad756e0 100644 --- a/jedi/evaluate/helpers.py +++ b/jedi/evaluate/helpers.py @@ -1,6 +1,7 @@ import copy from itertools import chain +from jedi._compatibility import unicode from jedi.parser import representation as pr from jedi import debug @@ -196,9 +197,7 @@ def scan_statement_for_calls(stmt, search_name, assignment_details=False): if isinstance(s_new, pr.Array): result += scan_array(s_new, search_name) else: - n = s_new.name - if isinstance(n, pr.Name) \ - and search_name in [str(x) for x in n.names]: + if search_name == unicode(s_new.name): result.append(c) s_new = s_new.next diff --git a/jedi/parser/__init__.py b/jedi/parser/__init__.py index 1c65f043..0fb7af75 100644 --- a/jedi/parser/__init__.py +++ b/jedi/parser/__init__.py @@ -133,6 +133,7 @@ class Parser(object): def _parse_name(self, pre_used_token=None): tok = next(self._gen) if pre_used_token is None else pre_used_token + self.module.temp_used_names.append(tok.string) if tok.type != tokenize.NAME: return None, tok return pr.NamePart(self.module, tok.string, None, tok.start_pos), next(self._gen)