mirror of
https://github.com/davidhalter/jedi.git
synced 2026-01-30 19:05:23 +08:00
Cleanup some of the module cache stuff
This commit is contained in:
@@ -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):
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user