From 88f521ad8265b0a43ffa0fbd65c36e66677106a7 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Fri, 16 Feb 2018 21:15:53 +0100 Subject: [PATCH] Add the name always to the script module --- jedi/api/__init__.py | 11 +++++++---- jedi/evaluate/sys_path.py | 4 ---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py index 5736c58d..4d891c96 100644 --- a/jedi/api/__init__.py +++ b/jedi/api/__init__.py @@ -134,11 +134,14 @@ class Script(object): debug.reset_time() def _get_module(self): - module = ModuleContext(self._evaluator, self._module_node, self.path) + name = '__main__' if self.path is not None: - name = dotted_path_in_sys_path(self._evaluator.get_sys_path(), self.path) - if name is not None: - imports.add_module(self._evaluator, name, module) + n = dotted_path_in_sys_path(self._evaluator.get_sys_path(), self.path) + if n is not None: + name = n + + module = ModuleContext(self._evaluator, self._module_node, self.path) + imports.add_module(self._evaluator, name, module) return module def __repr__(self): diff --git a/jedi/evaluate/sys_path.py b/jedi/evaluate/sys_path.py index 2339a805..60d42119 100644 --- a/jedi/evaluate/sys_path.py +++ b/jedi/evaluate/sys_path.py @@ -129,10 +129,6 @@ def check_sys_path_modifications(module_context): return added -def sys_path_with_modifications(evaluator, module_context): - return evaluator.get_sys_path() + check_sys_path_modifications(module_context) - - def discover_buildout_paths(evaluator, script_path): buildout_script_paths = set()