From 9b17be9ecf11660744a8ab7952108950c1f14507 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Tue, 10 Apr 2018 19:16:18 +0200 Subject: [PATCH] Cleanup some of the module cache stuff --- jedi/api/__init__.py | 2 +- jedi/evaluate/compiled/mixed.py | 3 ++- jedi/evaluate/imports.py | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py index 92d91b0f..3eacee63 100644 --- a/jedi/api/__init__.py +++ b/jedi/api/__init__.py @@ -152,7 +152,7 @@ class Script(object): self._evaluator, self._module_node, self.path, code_lines=self._code_lines ) - imports.add_module(self._evaluator, name, module) + imports.add_module_to_cache(self._evaluator, name, module) return module def __repr__(self): diff --git a/jedi/evaluate/compiled/mixed.py b/jedi/evaluate/compiled/mixed.py index 76366d55..b8003502 100644 --- a/jedi/evaluate/compiled/mixed.py +++ b/jedi/evaluate/compiled/mixed.py @@ -218,7 +218,8 @@ def _create(evaluator, access_handle, parent_context, *args): ) # TODO this __name__ is probably wrong. name = compiled_object.get_root_context().py__name__() - imports.add_module(evaluator, name, module_context) + if name is not None: + imports.add_module_to_cache(evaluator, name, module_context) tree_context = module_context.create_context( tree_node, diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py index 57beef80..463de355 100644 --- a/jedi/evaluate/imports.py +++ b/jedi/evaluate/imports.py @@ -501,13 +501,13 @@ def _load_module(evaluator, path=None, code=None, sys_path=None, else: module = compiled.load_module(evaluator, path=path, sys_path=sys_path) - if module_name is not None and module is not None: - add_module(evaluator, module_name, module, safe=safe_module_name) + if module is not None: + add_module_to_cache(evaluator, module_name, module, safe=safe_module_name) return module -def add_module(evaluator, module_name, module, safe=False): +def add_module_to_cache(evaluator, module_name, module, safe=False): if not safe and '.' not in module_name: # We cannot add paths with dots, because that would collide with # the sepatator dots for nested packages. Therefore we return