VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests 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

8
jedi/evaluate/finder.py
View File

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