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

Merge branch 'add-egg-links-to-syspath-on-parser' of https://github.com/blueyed/jedi into dev

Browse Source
This commit is contained in:
Dave Halter
2015-03-06 01:06:17 +01:00
parent 0b531d2b17 8621aae73c
commit a6c5d9f0a6
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jedi/evaluate/sys_path.py
View File

@@ -1,3 +1,4 @@
import glob
import os
import sys
@@ -16,17 +17,26 @@ def get_sys_path():
if not venv:
return
venv = os.path.abspath(venv)
if os.name == 'nt':
p = os.path.join(venv, 'lib', 'site-packages')
else:
p = os.path.join(venv, 'lib', 'python%d.%d' % sys.version_info[:2],
'site-packages')
p = _get_venv_sitepackages(venv)
if p not in sys_path:
sys_path.insert(0, p)
# Add all egg-links from the virtualenv.
for egg_link in glob.glob(os.path.join(p, '*.egg-link')):
with open(egg_link) as fd:
sys_path.insert(0, fd.readline().rstrip())
check_virtual_env(sys.path)
return [p for p in sys.path if p != ""]
def _get_venv_sitepackages(venv):
if os.name == 'nt':
p = os.path.join(venv, 'lib', 'site-packages')
else:
p = os.path.join(venv, 'lib', 'python%d.%d' % sys.version_info[:2],
'site-packages')
return p
def _execute_code(module_path, code):
c = "import os; from os.path import *; result=%s"