VimPlug/jedi-vim
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi-vim.git synced 2025-12-06 18:54:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Force the Python environment correctly

Browse Source
This commit is contained in:
Dave Halter
2018-04-05 00:27:00 +02:00
parent 72a2643f7c
commit 48a9ea085d
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pythonx/jedi_vim.py
View File

@@ -82,11 +82,11 @@ def _catch_exception(string, is_eval):
def vim_command(string): def vim_command(string):
_catch_exception(string, False) _catch_exception(string, is_eval=False)
def vim_eval(string): def vim_eval(string):
return _catch_exception(string, True) return _catch_exception(string, is_eval=True)
def no_jedi_warning(error=None): def no_jedi_warning(error=None):
@@ -157,14 +157,33 @@ def _check_jedi_availability(show_error=False):
return func_receiver return func_receiver
last_force_python_error = None
def _get_environment(): def _get_environment():
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.get_default_environment() environment = jedi.get_default_environment()
if force_python_version != "auto": if force_python_version != "auto":
if '0000' in force_python_version or '9999' in force_python_version:
# It's probably a float that wasn't shortened.
try:
force_python_version = "{:.1f}".format(float(force_python_version))
except ValueError:
pass
elif isinstance(force_python_version, float):
force_python_version = "{:.1f}".format(force_python_version)
try: try:
environment = jedi.api.environment.get_python_environment('python' + force_python_version) environment = jedi.api.environment.get_python_environment('python' + force_python_version)
except jedi.InvalidPythonEnvironment: except jedi.InvalidPythonEnvironment:
pass if last_force_python_error != force_python_version:
vim.command(
'echom "force_python_version=%s is not supported."'
% force_python_version
)
last_force_python_error = force_python_version
return environment return environment