From 18f26a0c04e07ebe3f9472c894d0bedd4890b8d5 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Mon, 23 Jul 2018 23:57:27 +0200 Subject: [PATCH] Change a module is None check to raise an Exception --- jedi/evaluate/imports.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py index 9a958c40..5db2be81 100644 --- a/jedi/evaluate/imports.py +++ b/jedi/evaluate/imports.py @@ -466,11 +466,6 @@ def import_module(evaluator, import_names, sys_path): safe_module_name=True, ) - if module is None: - # The file might raise an ImportError e.g. and therefore not be - # importable. - return NO_CONTEXTS - return ContextSet(module) @@ -515,6 +510,10 @@ def _load_module(evaluator, path=None, code=None, sys_path=None, else: assert dotted_name is not None module = compiled.load_module(evaluator, dotted_name=dotted_name, sys_path=sys_path) + if module is None: + # The file might raise an ImportError e.g. and therefore not be + # importable. + raise JediImportError(import_names) if module is not None and dotted_name is not None: add_module_to_cache(evaluator, dotted_name, module, safe=safe_module_name)