VimPlug/jedi-vim-fork
1
0
Fork 0
forked from VimPlug/jedi-vim
Code Pull Requests Activity

Some improvements for the virtualenv patch

Browse Source
This commit is contained in:
Dave Halter
2018-04-25 09:27:57 +02:00
parent 49fa267e59
commit 835e329883
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pythonx/jedi_vim.py
View File

@@ -26,11 +26,12 @@ else:
try: try:
# Somehow sys.prefix is set in combination with VIM and virtualenvs.
# However the sys path is not affected. Just reset it to the normal value.
sys.prefix = sys.base_prefix sys.prefix = sys.base_prefix
sys.exec_prefix = sys.base_exec_prefix sys.exec_prefix = sys.base_exec_prefix
except AttributeError: except AttributeError:
# Somehow sys.prefix is set in combination with VIM and virtualenvs. # If we're not in a virtualenv we don't care. Everything is fine.
# However the sys path is not affected. Just reset it to the normal value.
pass pass
@@ -164,7 +165,7 @@ def get_environment():
global last_force_python_error global last_force_python_error
force_python_version = vim_eval("g:jedi#force_py_version") force_python_version = vim_eval("g:jedi#force_py_version")
environment = jedi.api.environment.get_cached_default_environment() environment = None
if force_python_version != "auto": if force_python_version != "auto":
if '0000' in force_python_version or '9999' in force_python_version: if '0000' in force_python_version or '9999' in force_python_version:
# It's probably a float that wasn't shortened. # It's probably a float that wasn't shortened.
@@ -184,6 +185,9 @@ def get_environment():
% force_python_version % force_python_version
) )
last_force_python_error = force_python_version last_force_python_error = force_python_version
if environment is None:
environment = jedi.api.environment.get_cached_default_environment()
return environment return environment