Cleanup some of the module cache stuff

This commit is contained in:
Dave Halter
2018-04-10 19:16:18 +02:00
parent cf5f06f378
commit 9b17be9ecf
3 changed files with 6 additions and 5 deletions

View File

@@ -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):

View File

@@ -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,

View File

@@ -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