Skip to content

Commit

Permalink
Upgrade to Jedi 0.11.0
Browse files Browse the repository at this point in the history
Adds submodule rplugin/python3/deoplete/parso.
  • Loading branch information
blueyed committed Sep 25, 2017
1 parent 56528fd commit d723e0e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -1,3 +1,6 @@
[submodule "rplugin/python3/deoplete/jedi"]
path = rplugin/python3/deoplete/jedi
url = https://github.com/davidhalter/jedi.git
[submodule "rplugin/python3/deoplete/parso"]
path = rplugin/python3/deoplete/parso
url = https://github.com/davidhalter/parso.git
2 changes: 1 addition & 1 deletion rplugin/python3/deoplete/jedi
Submodule jedi updated 143 files
1 change: 1 addition & 0 deletions rplugin/python3/deoplete/parso
Submodule parso added at 8db149
7 changes: 5 additions & 2 deletions rplugin/python3/deoplete/sources/deoplete_jedi/server.py
Expand Up @@ -37,7 +37,9 @@
except ImportError:
import pickle

jedi_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'jedi')
libpath = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
jedi_path = os.path.join(libpath, 'jedi')
parso_path = os.path.join(libpath, 'parso')

# Type mapping. Empty values will use the key value instead.
# Keep them 5 characters max to minimize required space to display.
Expand Down Expand Up @@ -469,7 +471,8 @@ def __init__(self, desc_len=0, short_types=False, show_docstring=False,
self.env = os.environ.copy()
self.env.update({
'PYTHONPATH': os.pathsep.join(
(jedi_path, os.path.dirname(os.path.dirname(__file__)))),
(parso_path, jedi_path,
os.path.dirname(os.path.dirname(__file__)))),
})

if not python_path:
Expand Down

0 comments on commit d723e0e

Please sign in to comment.