diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py index f50f3a12..bf424309 100644 --- a/jedi/evaluate/imports.py +++ b/jedi/evaluate/imports.py @@ -104,11 +104,12 @@ class ImportWrapper(pr.Base): if from_import_name is not None: types = list(chain.from_iterable( - self._evaluator.find_types(s, from_import_name, is_goto=is_goto) + self._evaluator.find_types(s, unicode(from_import_name), + is_goto=is_goto) for s in types)) if not types: - importer = get_importer(self._evaluator, - tuple(import_path + [from_import_name]), + path = import_path + [from_import_name] + importer = get_importer(self._evaluator, tuple(path), module, self._import.level) types = importer.follow_file_system() # goto only accepts `Name` diff --git a/test/static_analysis/imports.py b/test/static_analysis/imports.py index 5383bc96..0df9bac4 100644 --- a/test/static_analysis/imports.py +++ b/test/static_analysis/imports.py @@ -14,7 +14,7 @@ date.today #! 5 attribute-error date.not_existing_attribute -#! 26 import-error +#! 14 import-error from datetime.date import today #! 16 import-error