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

Resolve path in get_cached_default_environment() in api/environment.py to

Browse Source 
prevent unnecessary cache busting when using pipenv.
This commit is contained in:
Nikhil Mitra
2019-04-04 19:28:16 -07:00
committed by Dave Halter
parent 77a7792afc
commit 8d0c4d3cec
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jedi/api/environment.py
View File

@@ -234,7 +234,12 @@ def _try_get_same_env():
def get_cached_default_environment(): def get_cached_default_environment():
var = os.environ.get('VIRTUAL_ENV') var = os.environ.get('VIRTUAL_ENV')
environment = _get_cached_default_environment() environment = _get_cached_default_environment()
if var and var != environment.path:
# Under macOS in some cases - notably when using Pipenv - the
# sys.prefix of the virtualenv is /path/to/env/bin/.. instead of
# /path/to/env so we need to fully resolve the paths in order to
# compare them.
if var and os.path.realpath(var) != os.path.realpath(environment.path):
_get_cached_default_environment.clear_cache() _get_cached_default_environment.clear_cache()
return _get_cached_default_environment() return _get_cached_default_environment()
return environment return environment