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

Merge branch 'master' of github.com:davidhalter/jedi

Browse Source
This commit is contained in:
Dave Halter
2018-03-23 00:57:40 +01:00
parent c8bb41662e 51b44032bd
commit 106573f20d
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jedi/api/environment.py
View File

@@ -189,10 +189,15 @@ def _get_executable_path(path, safe=True):
Returns None if it's not actually a virtual env. Returns None if it's not actually a virtual env.
""" """
bin_name = 'Scripts' if os.name == 'nt' else 'bin' if os.name == 'nt':
bin_name = 'Scripts'
extension = '.exe'
else:
bin_name = 'bin'
extension = ''
bin_folder = os.path.join(path, bin_name) bin_folder = os.path.join(path, bin_name)
activate = os.path.join(bin_folder, 'activate') activate = os.path.join(bin_folder, 'activate')
python = os.path.join(bin_folder, 'python') python = os.path.join(bin_folder, 'python' + extension)
if not all(os.path.exists(p) for p in (activate, python)): if not all(os.path.exists(p) for p in (activate, python)):
raise InvalidPythonEnvironment("One of bin/activate and bin/python is missing.") raise InvalidPythonEnvironment("One of bin/activate and bin/python is missing.")

11
test/test_evaluate/test_sys_path.py
View File

@@ -15,9 +15,14 @@ def test_paths_from_assignment(Script):
expr_stmt = script._module_node.children[0] expr_stmt = script._module_node.children[0]
return set(sys_path._paths_from_assignment(script._get_module(), expr_stmt)) return set(sys_path._paths_from_assignment(script._get_module(), expr_stmt))
assert paths('sys.path[0:0] = ["a"]') == {'/foo/a'} # Normalize paths for Windows.
assert paths('sys.path = ["b", 1, x + 3, y, "c"]') == {'/foo/b', '/foo/c'} path_a = os.path.abspath('/foo/a')
assert paths('sys.path = a = ["a"]') == {'/foo/a'} path_b = os.path.abspath('/foo/b')
path_c = os.path.abspath('/foo/c')
assert paths('sys.path[0:0] = ["a"]') == {path_a}
assert paths('sys.path = ["b", 1, x + 3, y, "c"]') == {path_b, path_c}
assert paths('sys.path = a = ["a"]') == {path_a}
# Fail for complicated examples. # Fail for complicated examples.
assert paths('sys.path, other = ["a"], 2') == set() assert paths('sys.path, other = ["a"], 2') == set()