From 8edaea31e2c1db5c7c22312c0c1f5ada32fd9bc6 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Tue, 29 Apr 2014 14:01:24 +0200 Subject: [PATCH] simplify some usage stuff --- jedi/api/__init__.py | 6 ++++-- jedi/api/usages.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py index 78b7063d..4de4118b 100644 --- a/jedi/api/__init__.py +++ b/jedi/api/__init__.py @@ -526,10 +526,12 @@ class Script(object): names = usages.usages(self._evaluator, definitions, search_name, module) for d in set(definitions): - if isinstance(d, (pr.Module, compiled.CompiledObject)): + try: + name_part = d.names[-1] + except AttributeError: names.append(classes.Definition(self._evaluator, d)) else: - names.append(classes.Definition(self._evaluator, d.names[-1])) + names.append(classes.Definition(self._evaluator, name_part)) settings.dynamic_flow_information = temp return helpers.sorted_definitions(set(names)) diff --git a/jedi/api/usages.py b/jedi/api/usages.py index 8a597da5..e6fb7889 100644 --- a/jedi/api/usages.py +++ b/jedi/api/usages.py @@ -1,4 +1,4 @@ -from jedi._compatibility import u +from jedi._compatibility import u, unicode from jedi import common from jedi.api import classes from jedi.parser import representation as pr