1
0
forked from VimPlug/jedi

Remove the module attribute from the parser.

This commit is contained in:
Dave Halter
2017-03-18 03:53:34 +01:00
parent d0b6d41e99
commit 0f66a3c7a8
11 changed files with 21 additions and 20 deletions

View File

@@ -123,7 +123,7 @@ def parse(grammar, path):
def _load_module(evaluator, path, python_object):
module = parse(evaluator.grammar, path).module
module = parse(evaluator.grammar, path).get_root_node()
python_module = inspect.getmodule(python_object)
evaluator.modules[python_module.__name__] = module

View File

@@ -461,13 +461,13 @@ def _load_module(evaluator, path=None, source=None, sys_path=None, parent_module
p = path
p = FastParser(evaluator.grammar, source_to_unicode(source), p)
save_parser(path, p)
return p.module
return p.get_root_node()
if sys_path is None:
sys_path = evaluator.sys_path
cached = load_parser(path)
module_node = load(source) if cached is None else cached.module
module_node = load(source) if cached is None else cached.get_root_node()
if isinstance(module_node, compiled.CompiledObject):
return module_node
@@ -499,7 +499,8 @@ def get_modules_containing_name(evaluator, modules, name):
except IOError:
return None
else:
return er.ModuleContext(evaluator, parser_cache_item.parser.module)
module_node = parser_cache_item.parser.get_root_node()
return er.ModuleContext(evaluator, module_node)
def check_fs(path):
with open(path, 'rb') as f:

View File

@@ -19,7 +19,7 @@ from jedi.evaluate import representation as er
from jedi.evaluate.instance import InstanceFunctionExecution, \
AbstractInstanceContext, CompiledInstance, BoundMethod
from jedi.evaluate import iterable
from jedi.parser import ParserWithRecovery
from jedi.parser.python import parse
from jedi import debug
from jedi.evaluate import precedence
from jedi.evaluate import param
@@ -265,7 +265,7 @@ def collections_namedtuple(evaluator, obj, arguments):
)
# Parse source
generated_class = ParserWithRecovery(evaluator.grammar, unicode(source)).module.subscopes[0]
generated_class = parse(source, grammar=evaluator.grammar).subscopes[0]
return set([er.ClassContext(evaluator, generated_class, evaluator.BUILTINS)])

View File

@@ -222,7 +222,7 @@ def _get_paths_from_buildout_script(evaluator, buildout_script):
p = ParserWithRecovery(evaluator.grammar, source, buildout_script)
save_parser(buildout_script, p)
return p.module
return p.get_root_node()
cached = load_parser(buildout_script)
module_node = cached and cached.module or load(buildout_script)