diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py index 5f976b49..eabb26cc 100644 --- a/jedi/evaluate/imports.py +++ b/jedi/evaluate/imports.py @@ -31,7 +31,7 @@ from jedi.evaluate.filters import AbstractNameDefinition from jedi.evaluate.base_context import ContextSet, NO_CONTEXTS -class ModuleCache(): +class ModuleCache(object): def __init__(self): self._path_cache = {} self._name_cache = {} @@ -487,9 +487,10 @@ def _load_module(evaluator, path=None, code=None, sys_path=None, parent_module=N cache_path=settings.cache_directory) from jedi.evaluate.context import ModuleContext - return ModuleContext(evaluator, module_node, path=path) + module = ModuleContext(evaluator, module_node, path=path) else: - return compiled.load_module(evaluator, path=path, sys_path=sys_path) + module = compiled.load_module(evaluator, path=path, sys_path=sys_path) + return module def add_module(evaluator, module_name, module): diff --git a/test/completion/__init__.py b/test/completion/__init__.py index 374dd947..3c1a4bb3 100644 --- a/test/completion/__init__.py +++ b/test/completion/__init__.py @@ -1,3 +1,9 @@ """ needed for some modules to test against packages. """ some_variable = 1 + + +from . import imports +# TODO this is not correct +#? +imports.relative() diff --git a/test/completion/imports.py b/test/completion/imports.py index 1afeb327..69e96cda 100644 --- a/test/completion/imports.py +++ b/test/completion/imports.py @@ -293,3 +293,4 @@ def relative(): from import_tree.pkg.mod1 import foobar #? int() foobar + return 1