VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-03-02 01:16:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Name lookups shouldn't return duplicates.

Browse Source
This commit is contained in:
Dave Halter
2015-10-10 20:01:03 +02:00
parent f77712ddf1
commit bf3fa11f6f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/api/__init__.py
View File

@@ -332,7 +332,7 @@ class Script(object):
:rtype: list of :class:`classes.Definition` :rtype: list of :class:`classes.Definition`
""" """
def resolve_import_paths(scopes): def resolve_import_paths(scopes):
for s in scopes.copy(): for s in set(scopes):
if isinstance(s, imports.ImportWrapper): if isinstance(s, imports.ImportWrapper):
scopes.remove(s) scopes.remove(s)
scopes.update(resolve_import_paths(set(s.follow()))) scopes.update(resolve_import_paths(set(s.follow())))

8
jedi/evaluate/finder.py
View File

@@ -248,7 +248,7 @@ class NameFinder(object):
return result return result
def _names_to_types(self, names, search_global): def _names_to_types(self, names, search_global):
types = [] types = set()
# Add isinstance and other if/assert knowledge. # Add isinstance and other if/assert knowledge.
if isinstance(self.name_str, tree.Name): if isinstance(self.name_str, tree.Name):
@@ -268,12 +268,12 @@ class NameFinder(object):
for name in names: for name in names:
new_types = _name_to_types(self._evaluator, name, self.scope) new_types = _name_to_types(self._evaluator, name, self.scope)
if isinstance(self.scope, (er.Class, er.Instance)) and not search_global: if isinstance(self.scope, (er.Class, er.Instance)) and not search_global:
types += self._resolve_descriptors(name, new_types) types |= set(self._resolve_descriptors(name, new_types))
else: else:
types += new_types types |= set(new_types)
if not names and isinstance(self.scope, er.Instance): if not names and isinstance(self.scope, er.Instance):
# handling __getattr__ / __getattribute__ # handling __getattr__ / __getattribute__
types = self._check_getattr(self.scope) return self._check_getattr(self.scope)
return types return types