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

Make a few modifications to always use the latest environment available.

Browse Source
This commit is contained in:
Dave Halter
2018-04-04 09:53:23 +02:00
parent 6b75519145
commit af956d70a3
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/__init__.py
View File

@@ -41,5 +41,6 @@ __version__ = '0.12.0'
from jedi.api import Script, Interpreter, set_debug_function, \
preload_module, names
from jedi import settings
from jedi.api.environment import find_virtualenvs, find_python_environments
from jedi.api.environment import find_virtualenvs, find_python_environments, \
get_default_environment, InvalidPythonEnvironment
from jedi.api.exceptions import InternalError

19
jedi/api/environment.py
View File

@@ -15,7 +15,7 @@ import parso
_VersionInfo = namedtuple('VersionInfo', 'major minor micro')
_SUPPORTED_PYTHONS = ['2.7', '3.3', '3.4', '3.5', '3.6']
_SUPPORTED_PYTHONS = ['3.6', '3.5', '3.4', '3.3', '2.7']
class InvalidPythonEnvironment(Exception):
@@ -55,7 +55,8 @@ class Environment(_BaseEnvironment):
return _VersionInfo(*[int(m) for m in match.groups()])
def __repr__(self):
return '<%s: %s>' % (self.__class__.__name__, self._base_path)
version = '.'.join(str(i) for i in self.version_info)
return '<%s: %s in %s>' % (self.__class__.__name__, version, self._base_path)
def get_evaluator_subprocess(self, evaluator):
return EvaluatorSubprocess(evaluator, self._get_subprocess())
@@ -105,10 +106,18 @@ def _get_virtual_env_from_var():
def get_default_environment():
"""
Tries to return an active VirtualEnv. If there is no VIRTUAL_ENV variable
set it will return the latest Python version installed on the system. This
makes it possible to use as many new Python features as possible when using
autocompletion and other functionality.
"""
virtual_env = _get_virtual_env_from_var()
if virtual_env is not None:
return virtual_env
return DefaultEnvironment()
for environment in find_python_environments():
return environment
def find_virtualenvs(paths=None, **kwargs):
@@ -151,11 +160,13 @@ def find_virtualenvs(paths=None, **kwargs):
def find_python_environments():
"""
Ignores virtualenvs and returns the different Python version environments.
The environments are sorted from latest to oldest Python version.
"""
current_version = '%s.%s' % (sys.version_info.major, sys.version_info.minor)
for version_string in _SUPPORTED_PYTHONS:
if version_string == current_version:
yield get_default_environment()
yield DefaultEnvironment()
else:
try:
yield get_python_environment('python' + version_string)