From 84b774d9e1715bd91ab7557b8b02c8f8b62ee061 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Mon, 27 Apr 2015 17:07:38 +0200 Subject: [PATCH] Small refactorings. --- jedi/evaluate/imports.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py index ca81e5ec..861ad595 100644 --- a/jedi/evaluate/imports.py +++ b/jedi/evaluate/imports.py @@ -98,9 +98,9 @@ class ImportWrapper(pr.Base): if from_import_name is not None: types = list(chain.from_iterable( - self._evaluator.find_types(s, unicode(from_import_name), + self._evaluator.find_types(t, unicode(from_import_name), is_goto=is_goto) - for s in types)) + for t in types)) if not types: path = import_path + [from_import_name] importer = get_importer(self._evaluator, tuple(path), @@ -279,8 +279,7 @@ class _Importer(object): def follow(self): if not self.import_path: return [] - modules = self._do_import(self.import_path, self.sys_path_with_modifications()) - return modules + return self._do_import(self.import_path, self.sys_path_with_modifications()) def namespace_packages(self, found_path, import_path): """