VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-03-01 23:26:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Parso changed load_python_grammar to load_grammar.

Browse Source
This commit is contained in:
Dave Halter
2017-05-25 12:41:19 -04:00
parent d0127a7f61
commit 3f36824a94
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/api/__init__.py
View File

@@ -13,7 +13,7 @@ import os
import warnings import warnings
import sys import sys
from parso import load_python_grammar import parso
from parso.python import tree from parso.python import tree
from parso.utils import source_to_unicode, splitlines from parso.utils import source_to_unicode, splitlines
@@ -124,7 +124,7 @@ class Script(object):
cache.clear_time_caches() cache.clear_time_caches()
debug.reset_time() debug.reset_time()
self._grammar = load_python_grammar(version='%s.%s' % sys.version_info[:2]) self._grammar = parso.load_grammar(version='%s.%s' % sys.version_info[:2])
if sys_path is None: if sys_path is None:
venv = os.getenv('VIRTUAL_ENV') venv = os.getenv('VIRTUAL_ENV')
if venv: if venv:

4
jedi/evaluate/__init__.py
View File

@@ -64,7 +64,7 @@ import copy
import sys import sys
from parso.python import tree from parso.python import tree
from parso import load_python_grammar import parso
from jedi import debug from jedi import debug
from jedi.common import unite from jedi.common import unite
@@ -89,7 +89,7 @@ from jedi import parser_utils
class Evaluator(object): class Evaluator(object):
def __init__(self, grammar, sys_path=None): def __init__(self, grammar, sys_path=None):
self.grammar = grammar self.grammar = grammar
self.latest_grammar = load_python_grammar('3.6') self.latest_grammar = parso.load_grammar('3.6')
self.memoize_cache = {} # for memoize decorators self.memoize_cache = {} # for memoize decorators
# To memorize modules -> equals `sys.modules`. # To memorize modules -> equals `sys.modules`.
self.modules = {} # like `sys.modules`. self.modules = {} # like `sys.modules`.