From 9931e0888b2419326ae10ebbfae532261c5c125f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 30 Jun 2016 16:11:56 +0200 Subject: Fix submodules --- vim/bundle/YouCompleteMe | 1 + vim/bundle/YouCompleteMe/python/ycm/paths.py | 135 --------------------------- 2 files changed, 1 insertion(+), 135 deletions(-) create mode 160000 vim/bundle/YouCompleteMe delete mode 100644 vim/bundle/YouCompleteMe/python/ycm/paths.py (limited to 'vim/bundle/YouCompleteMe/python/ycm/paths.py') diff --git a/vim/bundle/YouCompleteMe b/vim/bundle/YouCompleteMe new file mode 160000 index 0000000..0de1c0c --- /dev/null +++ b/vim/bundle/YouCompleteMe @@ -0,0 +1 @@ +Subproject commit 0de1c0c9bb13ce82172b472c676035cd47cf6a6a diff --git a/vim/bundle/YouCompleteMe/python/ycm/paths.py b/vim/bundle/YouCompleteMe/python/ycm/paths.py deleted file mode 100644 index 17edafa..0000000 --- a/vim/bundle/YouCompleteMe/python/ycm/paths.py +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright (C) 2015 YouCompleteMe contributors. -# -# This file is part of YouCompleteMe. -# -# YouCompleteMe is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# YouCompleteMe is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with YouCompleteMe. If not, see . - -from __future__ import unicode_literals -from __future__ import print_function -from __future__ import division -from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() -from builtins import * # noqa - -import os -import sys -import vim -import functools -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_YCMD = os.path.join( DIR_OF_CURRENT_SCRIPT, '..', '..', 'third_party', - 'ycmd' ) -WIN_PYTHON_PATH = os.path.join( sys.exec_prefix, 'python.exe' ) -PYTHON_BINARY_REGEX = re.compile( - r'python((2(\.[67])?)|(3(\.[3-9])?))?(.exe)?$' ) - - -def Memoize( obj ): - cache = obj.cache = {} - - @functools.wraps( obj ) - def memoizer( *args, **kwargs ): - key = str( args ) + str( kwargs ) - if key not in cache: - cache[ key ] = obj( *args, **kwargs ) - return cache[ key ] - return memoizer - - -@Memoize -def PathToPythonInterpreter(): - from ycmd import utils - - python_interpreter = vim.eval( 'g:ycm_server_python_interpreter' ) - - if python_interpreter: - if IsPythonVersionCorrect( python_interpreter ): - return python_interpreter - - raise RuntimeError( "Path in 'g:ycm_server_python_interpreter' option " - "does not point to a valid Python 2.6+ or 3.3+." ) - - python_interpreter = _PathToPythonUsedDuringBuild() - if IsPythonVersionCorrect( python_interpreter ): - return python_interpreter - - # On UNIX platforms, we use sys.executable as the Python interpreter path. - # We cannot use sys.executable on Windows because for unknown reasons, it - # returns the Vim executable. Instead, we use sys.exec_prefix to deduce the - # interpreter path. - python_interpreter = ( WIN_PYTHON_PATH if utils.OnWindows() else - sys.executable ) - - if IsPythonVersionCorrect( python_interpreter ): - return python_interpreter - - # As a last resort, we search python in the PATH. We prefer Python 2 over 3 - # for the sake of backwards compatibility with ycm_extra_conf.py files out - # there; few people wrote theirs to work on py3. - # So we check 'python2' before 'python' because on some distributions (Arch - # Linux for example), python refers to python3. - python_interpreter = utils.PathToFirstExistingExecutable( [ 'python2', - 'python', - 'python3' ] ) - - if IsPythonVersionCorrect( python_interpreter ): - return python_interpreter - - raise RuntimeError( "Cannot find Python 2.6+ or 3.3+. You can set its path " - "using the 'g:ycm_server_python_interpreter' " - "option." ) - - -def _PathToPythonUsedDuringBuild(): - from ycmd import utils - - try: - filepath = os.path.join( DIR_OF_YCMD, 'PYTHON_USED_DURING_BUILDING' ) - return utils.ReadFile( filepath ).strip() - # We need to check for IOError for Python2 and OSError for Python3 - except ( IOError, OSError ): - return None - - -def EndsWithPython( path ): - """Check if given path ends with a python 2.6+ or 3.3+ name.""" - return path and PYTHON_BINARY_REGEX.search( path ) is not None - - -def IsPythonVersionCorrect( path ): - """Check if given path is the Python interpreter version 2.6+ or 3.3+.""" - from ycmd import utils - - if not EndsWithPython( path ): - return False - - command = [ path, - '-c', - "import sys;" - "major, minor = sys.version_info[ :2 ];" - "good_python = ( major == 2 and minor >= 6 ) " - "or ( major == 3 and minor >= 3 ) or major > 3;" - # If this looks weird, remember that: - # int( True ) == 1 - # int( False ) == 0 - "sys.exit( not good_python )" ] - - return utils.SafePopen( command ).wait() == 0 - - -def PathToServerScript(): - return os.path.join( DIR_OF_YCMD, 'ycmd' ) -- cgit v1.2.3