From 03de39092a8611ea800173b868b1b4a39cf06811 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Mon, 20 May 2019 09:34:12 +0200 Subject: [PATCH] Reindent some code --- jedi/evaluate/imports.py | 46 +++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py index 0f5a103d..4afc2bcc 100644 --- a/jedi/evaluate/imports.py +++ b/jedi/evaluate/imports.py @@ -500,31 +500,33 @@ def get_modules_containing_name(evaluator, modules, name): try: f = open(path, 'rb') except FileNotFoundError: - return + return None with f: code = python_bytes_to_unicode(f.read(), errors='replace') - if name in code: - e_sys_path = evaluator.get_sys_path() - if base_names: - module_name = os.path.basename(path) - module_name = sys_path.remove_python_path_suffix(module_name) - is_package = module_name == '__init__' - if is_package: - raise NotImplementedError( - "This is probably not possible yet, please add a failing test first") - module_name = os.path.basename(os.path.dirname(path)) - import_names = base_names + (module_name,) - else: - import_names, is_package = sys_path.transform_path_to_dotted(e_sys_path, path) + if name not in code: + return None - module = _load_python_module( - evaluator, KnownContentFileIO(path, code), - sys_path=e_sys_path, - import_names=import_names, - is_package=is_package, - ) - evaluator.module_cache.add(import_names, ContextSet([module])) - return module + e_sys_path = evaluator.get_sys_path() + if base_names: + module_name = os.path.basename(path) + module_name = sys_path.remove_python_path_suffix(module_name) + is_package = module_name == '__init__' + if is_package: + raise NotImplementedError( + "This is probably not possible yet, please add a failing test first") + module_name = os.path.basename(os.path.dirname(path)) + import_names = base_names + (module_name,) + else: + import_names, is_package = sys_path.transform_path_to_dotted(e_sys_path, path) + + module = _load_python_module( + evaluator, KnownContentFileIO(path, code), + sys_path=e_sys_path, + import_names=import_names, + is_package=is_package, + ) + evaluator.module_cache.add(import_names, ContextSet([module])) + return module # skip non python modules used_mod_paths = set()