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

A small refactoring

Browse Source
This commit is contained in:
Dave Halter
2018-04-14 15:38:32 +02:00
parent 9f07e7e352
commit 45fb770033
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/__init__.py
+1 -1
View File
@@ -43,5 +43,5 @@ from jedi.api import Script, Interpreter, set_debug_function, \
from jedi import settings 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, create_environment, \ get_default_environment, InvalidPythonEnvironment, create_environment, \
find_executable, get_python_environment get_python_environment
from jedi.api.exceptions import InternalError from jedi.api.exceptions import InternalError
jedi/api/environment.py
+4 -4
View File
@@ -241,25 +241,25 @@ def _get_python_prefix(executable):
# TODO: this function should probably return a list of environments since # TODO: this function should probably return a list of environments since
# multiple Python installations can be found on a system for the same version. # multiple Python installations can be found on a system for the same version.
def get_python_environment(python): def get_python_environment(name):
""" """
Return the first Python environment found for a given path or for a string Return the first Python environment found for a given path or for a string
of the form 'pythonX.Y' where X and Y are the major and minor versions of of the form 'pythonX.Y' where X and Y are the major and minor versions of
Python. Python.
""" """
exe = find_executable(python) exe = find_executable(name)
if exe: if exe:
if exe == sys.executable: if exe == sys.executable:
return SameEnvironment() return SameEnvironment()
return _Environment(_get_python_prefix(exe), exe) return _Environment(_get_python_prefix(exe), exe)
if os.name == 'nt': if os.name == 'nt':
match = re.search('python(\d+\.\d+)$', python) match = re.search('python(\d+\.\d+)$', name)
if match: if match:
version = match.group(1) version = match.group(1)
for prefix, exe in _get_executables_from_windows_registry(version): for prefix, exe in _get_executables_from_windows_registry(version):
return _Environment(prefix, exe) return _Environment(prefix, exe)
raise InvalidPythonEnvironment("Cannot find executable %s." % python) raise InvalidPythonEnvironment("Cannot find executable %s." % name)
def create_environment(path, safe=True): def create_environment(path, safe=True):