From 47e2cf95d2a7d2d58fbba6fd2a78fda892071301 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Wed, 1 Jan 2020 17:07:19 +0100 Subject: [PATCH] Change ModuleValue param order and add defaults --- jedi/api/__init__.py | 3 ++- jedi/api/completion.py | 2 -- jedi/inference/sys_path.py | 3 ++- jedi/inference/value/module.py | 4 ++-- jedi/plugins/stdlib.py | 2 -- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py index 2073aab0..c4ce99d1 100644 --- a/jedi/api/__init__.py +++ b/jedi/api/__init__.py @@ -167,7 +167,8 @@ class Script(object): names = ('__main__',) module = ModuleValue( - self._inference_state, self._module_node, file_io, + self._inference_state, self._module_node, + file_io=file_io, string_names=names, code_lines=self._code_lines, is_package=is_package, diff --git a/jedi/api/completion.py b/jedi/api/completion.py index 746c4338..ff8b53ef 100644 --- a/jedi/api/completion.py +++ b/jedi/api/completion.py @@ -476,8 +476,6 @@ class Completion: module_value = ModuleValue( self._inference_state, module_node, - file_io=None, - string_names=None, code_lines=code_lines, ) module_value.parent_context = self._module_context diff --git a/jedi/inference/sys_path.py b/jedi/inference/sys_path.py index 4d066611..a45999f1 100644 --- a/jedi/inference/sys_path.py +++ b/jedi/inference/sys_path.py @@ -156,7 +156,8 @@ def _get_paths_from_buildout_script(inference_state, buildout_script_path): from jedi.inference.value import ModuleValue module_context = ModuleValue( - inference_state, module_node, file_io, + inference_state, module_node, + file_io=file_io, string_names=None, code_lines=get_cached_code_lines(inference_state.grammar, buildout_script_path), ).as_context() diff --git a/jedi/inference/value/module.py b/jedi/inference/value/module.py index 20332fee..8f2ba9e1 100644 --- a/jedi/inference/value/module.py +++ b/jedi/inference/value/module.py @@ -176,8 +176,8 @@ class ModuleMixin(SubModuleDictMixin): class ModuleValue(ModuleMixin, TreeValue): api_type = u'module' - def __init__(self, inference_state, module_node, file_io, string_names, - code_lines, is_package=False): + def __init__(self, inference_state, module_node, code_lines, file_io=None, + string_names=None, is_package=False): super(ModuleValue, self).__init__( inference_state, parent_context=None, diff --git a/jedi/plugins/stdlib.py b/jedi/plugins/stdlib.py index 4c429a2c..448f2b50 100644 --- a/jedi/plugins/stdlib.py +++ b/jedi/plugins/stdlib.py @@ -467,8 +467,6 @@ def collections_namedtuple(value, arguments, callback): generated_class = next(module.iter_classdefs()) parent_context = ModuleValue( inference_state, module, - file_io=None, - string_names=None, code_lines=parso.split_lines(code, keepends=True), ).as_context()