vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Auto merge of #3163 - micbou:python-path, r=puremourning

Browse Source 
[READY] Add minimal dependencies to Python path

Ideally, we shouldn't add anything to the Python path because it can break other plugins written in Python but since the alternative is to tell users to manually install our dependencies, we don't really have a choice (the last thing we want are reports about pip failing to install packages). Still, we can at least only add the dependencies we need:
 - [requests](https://github.com/requests/requests);
 - [pythonfutures](https://github.com/agronholm/pythonfutures) in Python 2;
 - [requests-futures](https://github.com/ross/requests-futures);
 - [frozendict](https://github.com/slezica/python-frozendict);
 - [python-future](https://github.com/PythonCharmers/python-future).

Fixes #3162.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/youcompleteme/3163)
<!-- Reviewable:end -->
This commit is contained in:
zzbot 2018-10-14 07:52:27 -07:00 committed by GitHub
commit 34dee0ebcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.ycm_extra_conf.py
View File

@ -29,6 +29,7 @@
# For more information, please refer to <http://unlicense.org/> # For more information, please refer to <http://unlicense.org/>
import os import os
import subprocess
DIR_OF_THIS_SCRIPT = os.path.abspath( os.path.dirname( __file__ ) ) DIR_OF_THIS_SCRIPT = os.path.abspath( os.path.dirname( __file__ ) )
DIR_OF_THIRD_PARTY = os.path.join( DIR_OF_THIS_SCRIPT, 'third_party' ) DIR_OF_THIRD_PARTY = os.path.join( DIR_OF_THIS_SCRIPT, 'third_party' )
@ -46,19 +47,23 @@ def GetStandardLibraryIndexInSysPath( sys_path ):
def PythonSysPath( **kwargs ): def PythonSysPath( **kwargs ):
sys_path = kwargs[ 'sys_path' ] sys_path = kwargs[ 'sys_path' ]
for folder in os.listdir( DIR_OF_THIRD_PARTY ): dependencies = [ os.path.join( DIR_OF_THIS_SCRIPT, 'python' ),
sys_path.insert( 0, os.path.realpath( os.path.join( DIR_OF_THIRD_PARTY, os.path.join( DIR_OF_THIRD_PARTY, 'requests-futures' ),
folder ) ) ) os.path.join( DIR_OF_THIRD_PARTY, 'ycmd' ),
os.path.join( DIR_OF_YCMD_THIRD_PARTY, 'frozendict' ),
os.path.join( DIR_OF_YCMD_THIRD_PARTY, 'requests' ) ]
for folder in os.listdir( DIR_OF_YCMD_THIRD_PARTY ): # The concurrent.futures module is part of the standard library on Python 3.
if folder == 'python-future': interpreter_path = kwargs[ 'interpreter_path' ]
folder = os.path.join( folder, 'src' ) major_version = int( subprocess.check_output( [
sys_path.insert( GetStandardLibraryIndexInSysPath( sys_path ) + 1, interpreter_path, '-c', 'import sys; print( sys.version_info[ 0 ] )' ]
os.path.realpath( os.path.join( DIR_OF_YCMD_THIRD_PARTY, ).rstrip().decode( 'utf8' ) )
folder ) ) ) if major_version == 2:
continue dependencies.append( os.path.join( DIR_OF_THIRD_PARTY, 'pythonfutures' ) )
sys_path.insert( 0, os.path.realpath( os.path.join( DIR_OF_YCMD_THIRD_PARTY, sys_path[ 0:0 ] = dependencies
folder ) ) ) sys_path.insert( GetStandardLibraryIndexInSysPath( sys_path ) + 1,
os.path.join( DIR_OF_YCMD_THIRD_PARTY, 'python-future',
'src' ) )
return sys_path return sys_path

31
autoload/youcompleteme.vim
View File

@ -186,23 +186,34 @@ from __future__ import print_function
from __future__ import division from __future__ import division
from __future__ import absolute_import from __future__ import absolute_import
import os import os.path as p
import sys import sys
import traceback import traceback
import vim import vim
# Add python sources folder to the system path. root_folder = p.normpath( p.join( vim.eval( 's:script_folder_path' ), '..' ) )
script_folder = vim.eval( 's:script_folder_path' ) third_party_folder = p.join( root_folder, 'third_party' )
sys.path.insert( 0, os.path.join( script_folder, '..', 'python' ) ) ycmd_third_party_folder = p.join( third_party_folder, 'ycmd', 'third_party' )
sys.path.insert( 0, os.path.join( script_folder, '..', 'third_party', 'ycmd' ) )
# Add dependencies to Python path.
dependencies = [ p.join( root_folder, 'python' ),
p.join( third_party_folder, 'requests-futures' ),
p.join( third_party_folder, 'ycmd' ),
p.join( ycmd_third_party_folder, 'frozendict' ),
p.join( ycmd_third_party_folder, 'requests' ) ]
# The concurrent.futures module is part of the standard library on Python 3.
if sys.version_info[ 0 ] == 2:
dependencies.append( p.join( third_party_folder, 'pythonfutures' ) )
sys.path[ 0:0 ] = dependencies
# We enclose this code in a try/except block to avoid backtraces in Vim. # We enclose this code in a try/except block to avoid backtraces in Vim.
try: try:
from ycmd import server_utils as su # The python-future module must be inserted after the standard library path.
su.AddNearestThirdPartyFoldersToSysPath( script_folder ) from ycmd.server_utils import GetStandardLibraryIndexInSysPath
# We need to import ycmd's third_party folders as well since we import and sys.path.insert( GetStandardLibraryIndexInSysPath() + 1,
# use ycmd code in the client. p.join( ycmd_third_party_folder, 'python-future', 'src' ) )
su.AddNearestThirdPartyFoldersToSysPath( su.__file__ )
# Import the modules used in this file. # Import the modules used in this file.
from ycm import base, vimsupport, youcompleteme from ycm import base, vimsupport, youcompleteme