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

There's really no bin/activate needed for an environment to work

Browse Source
This commit is contained in:
Dave Halter
2018-04-15 16:15:20 +02:00
parent ed2a0a8218
commit a21d77e8ad
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jedi/api/environment.py
View File

@@ -301,13 +301,11 @@ def _get_executable_path(path, safe=True):
""" """
if os.name == 'nt': if os.name == 'nt':
activate = os.path.join(path, 'Scripts', 'activate.bat')
python = os.path.join(path, 'Scripts', 'python.exe') python = os.path.join(path, 'Scripts', 'python.exe')
else: else:
activate = os.path.join(path, 'bin', 'activate')
python = os.path.join(path, 'bin', 'python') python = os.path.join(path, 'bin', 'python')
if not all(os.path.exists(p) for p in (activate, python)): if not os.path.exists(python):
raise InvalidPythonEnvironment("One of bin/activate and bin/python is missing.") raise InvalidPythonEnvironment("%s seems to be missing." % python)
if safe and not _is_safe(python): if safe and not _is_safe(python):
raise InvalidPythonEnvironment("The python binary is potentially unsafe.") raise InvalidPythonEnvironment("The python binary is potentially unsafe.")
@@ -380,7 +378,7 @@ def _is_unix_safe_simple(real_path):
# written by a user and therefore attacking Jedi is not as simple. # written by a user and therefore attacking Jedi is not as simple.
# The attack could look like the following: # The attack could look like the following:
# 1. A user clones a repository. # 1. A user clones a repository.
# 2. The repository has an inocent looking folder called foobar. jedi # 2. The repository has an innocent looking folder called foobar. jedi
# searches for the folder and executes foobar/bin/python --version if # searches for the folder and executes foobar/bin/python --version if
# there's also a foobar/bin/activate. # there's also a foobar/bin/activate.
# 3. The bin/python is obviously not a python script but a bash script or # 3. The bin/python is obviously not a python script but a bash script or