From 7fea6437d9f1af440d00dd3ea2f6182ce28b909c Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Fri, 26 Sep 2014 13:07:21 +0200 Subject: [PATCH] Fix issues with Definition.full_name --- jedi/api/classes.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/jedi/api/classes.py b/jedi/api/classes.py index d2d1a0cf..68ddd424 100644 --- a/jedi/api/classes.py +++ b/jedi/api/classes.py @@ -36,7 +36,6 @@ def defined_names(evaluator, scope): pair = next(get_names_of_scope(evaluator, scope, star_search=False, include_builtin=False), None) 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)] @@ -168,16 +167,11 @@ class BaseDefinition(object): def _path(self): """The module path.""" path = [] - - def insert_nonnone(x): - if x: - path.insert(0, x) - par = self._definition while par is not None: if isinstance(par, pr.Import): - insert_nonnone(par.namespace_names) - insert_nonnone(par.from_names) + path += par.from_names + path += par.namespace_names if par.relative_count == 0: break with common.ignored(AttributeError):