1
0
forked from VimPlug/jedi

Fix issues with Definition.full_name

This commit is contained in:
Dave Halter
2014-09-26 13:07:21 +02:00
parent 4f4ac505a3
commit 7fea6437d9

View File

@@ -36,7 +36,6 @@ def defined_names(evaluator, scope):
pair = next(get_names_of_scope(evaluator, scope, star_search=False, pair = next(get_names_of_scope(evaluator, scope, star_search=False,
include_builtin=False), None) include_builtin=False), None)
names = pair[1] if pair else [] names = pair[1] if pair else []
names = [n for n in names if isinstance(n, pr.Import) or (len(n) == 1)]
return [Definition(evaluator, d) for d in sorted(names, key=lambda s: s.start_pos)] return [Definition(evaluator, d) for d in sorted(names, key=lambda s: s.start_pos)]
@@ -168,16 +167,11 @@ class BaseDefinition(object):
def _path(self): def _path(self):
"""The module path.""" """The module path."""
path = [] path = []
def insert_nonnone(x):
if x:
path.insert(0, x)
par = self._definition par = self._definition
while par is not None: while par is not None:
if isinstance(par, pr.Import): if isinstance(par, pr.Import):
insert_nonnone(par.namespace_names) path += par.from_names
insert_nonnone(par.from_names) path += par.namespace_names
if par.relative_count == 0: if par.relative_count == 0:
break break
with common.ignored(AttributeError): with common.ignored(AttributeError):