forked from VimPlug/jedi
Some changes because parso has changed.
This commit is contained in:
@@ -105,8 +105,7 @@ class MixedObjectFilter(compiled.CompiledObjectFilter):
|
||||
|
||||
@memoize_default(evaluator_is_first_arg=True)
|
||||
def _load_module(evaluator, path, python_object):
|
||||
module = parse(
|
||||
grammar=evaluator.grammar,
|
||||
module = evaluator.grammar.parse(
|
||||
path=path,
|
||||
cache=True,
|
||||
diff_cache=True,
|
||||
|
||||
@@ -18,7 +18,6 @@ from jedi.evaluate import representation as er
|
||||
from jedi.evaluate.instance import InstanceFunctionExecution, \
|
||||
AbstractInstanceContext, CompiledInstance, BoundMethod
|
||||
from jedi.evaluate import iterable
|
||||
from parso.python import parse
|
||||
from jedi import debug
|
||||
from jedi.evaluate import precedence
|
||||
from jedi.evaluate import param
|
||||
@@ -270,7 +269,7 @@ def collections_namedtuple(evaluator, obj, arguments):
|
||||
)
|
||||
|
||||
# Parse source
|
||||
generated_class = next(parse(source, grammar=evaluator.grammar).iter_classdefs())
|
||||
generated_class = next(evaluator.grammar.parse(source).iter_classdefs())
|
||||
return set([er.ClassContext(evaluator, generated_class, evaluator.BUILTINS)])
|
||||
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@ from jedi.evaluate.site import addsitedir
|
||||
|
||||
from jedi._compatibility import exec_function, unicode
|
||||
from parso.python import tree
|
||||
from parso.python import parse
|
||||
from jedi.evaluate.cache import memoize_default
|
||||
from jedi.evaluate.compiled import CompiledObject
|
||||
from jedi.evaluate.context import ContextualizedNode
|
||||
@@ -212,9 +211,8 @@ def sys_path_with_modifications(evaluator, module_context):
|
||||
|
||||
def _get_paths_from_buildout_script(evaluator, buildout_script_path):
|
||||
try:
|
||||
module_node = parse(
|
||||
module_node = evaluator.grammar.parse(
|
||||
path=buildout_script_path,
|
||||
grammar=evaluator.grammar,
|
||||
cache=True,
|
||||
cache_path=settings.cache_directory
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user