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

Import order fixes for py3

Browse Source 
The import machinery works differently in py3, so some massaging is in
order.
This commit is contained in:
Val Markovic 2016-02-28 14:39:55 -08:00
parent 1e72f4d421
commit 92346d2bcc
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/ycm/paths.py
View File

@ -29,10 +29,10 @@ import vim
import functools import functools
import re import re
# Can't import these from setup.py because it makes nosetests go crazy.
DIR_OF_CURRENT_SCRIPT = os.path.dirname( os.path.abspath( __file__ ) ) DIR_OF_CURRENT_SCRIPT = os.path.dirname( os.path.abspath( __file__ ) )
DIR_OF_YCMD = os.path.join( DIR_OF_CURRENT_SCRIPT, '..', '..', 'third_party', DIR_OF_YCMD = os.path.join( DIR_OF_CURRENT_SCRIPT, '..', '..', 'third_party',
'ycmd' ) 'ycmd' )
WIN_PYTHON_PATH = os.path.join( sys.exec_prefix, 'python.exe' ) WIN_PYTHON_PATH = os.path.join( sys.exec_prefix, 'python.exe' )
PYTHON_BINARY_REGEX = re.compile( r'python(2(\.[67])?)?(.exe)?$' ) PYTHON_BINARY_REGEX = re.compile( r'python(2(\.[67])?)?(.exe)?$' )

21
python/ycm/setup.py
View File

@ -15,25 +15,36 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with YouCompleteMe. If not, see <http://www.gnu.org/licenses/>. # along with YouCompleteMe. If not, see <http://www.gnu.org/licenses/>.
from __future__ import unicode_literals
from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
# No imports from `future` because when this is loaded, sys.path hasn't been set
# up yet!
import sys import sys
import os import os
import paths
# Can't import these from paths.py because that uses `future` imports
DIR_OF_CURRENT_SCRIPT = os.path.dirname( os.path.abspath( __file__ ) )
DIR_OF_YCMD = os.path.join( DIR_OF_CURRENT_SCRIPT, '..', '..', 'third_party',
'ycmd' )
def SetUpSystemPaths(): def SetUpSystemPaths():
sys.path.insert( 0, os.path.join( paths.DIR_OF_YCMD ) ) sys.path.insert( 0, os.path.join( DIR_OF_YCMD ) )
from ycmd import server_utils as su from ycmd import server_utils as su
su.AddNearestThirdPartyFoldersToSysPath( paths.DIR_OF_CURRENT_SCRIPT ) su.AddNearestThirdPartyFoldersToSysPath( DIR_OF_CURRENT_SCRIPT )
# We need to import ycmd's third_party folders as well since we import and # We need to import ycmd's third_party folders as well since we import and
# use ycmd code in the client. # use ycmd code in the client.
su.AddNearestThirdPartyFoldersToSysPath( su.__file__ ) su.AddNearestThirdPartyFoldersToSysPath( su.__file__ )
def SetUpYCM(): def SetUpYCM():
import base from ycm import base, paths
from ycmd import user_options_store, utils from ycmd import user_options_store, utils
from youcompleteme import YouCompleteMe from ycm.youcompleteme import YouCompleteMe
base.LoadJsonDefaultsIntoVim() base.LoadJsonDefaultsIntoVim()