Minor tweaks

This commit is contained in:
Val Markovic 2016-02-28 18:01:19 -08:00
parent 3dbbfc3c25
commit be1bb3617d
2 changed files with 2 additions and 3 deletions

View File

@ -54,7 +54,6 @@ def EndsWithPython_Python2Paths_test():
def EndsWithPython_Python3Paths_test(): def EndsWithPython_Python3Paths_test():
python_paths = [ python_paths = [
'python',
'python3', 'python3',
'/usr/bin/python3.3', '/usr/bin/python3.3',
'/home/user/.pyenv/shims/python3.3', '/home/user/.pyenv/shims/python3.3',

View File

@ -26,12 +26,12 @@ from builtins import * # noqa
from future.utils import iteritems from future.utils import iteritems
import os import os
import vim import vim
import tempfile
import json import json
import re import re
import signal import signal
import base64 import base64
from subprocess import PIPE from subprocess import PIPE
from tempfile import NamedTemporaryFile
from ycm import paths, vimsupport from ycm import paths, vimsupport
from ycmd import utils from ycmd import utils
from ycmd.request_wrap import RequestWrap from ycmd.request_wrap import RequestWrap
@ -111,7 +111,7 @@ class YouCompleteMe( object ):
self._available_completers = {} self._available_completers = {}
server_port = utils.GetUnusedLocalhostPort() server_port = utils.GetUnusedLocalhostPort()
# The temp options file is deleted by ycmd during startup # The temp options file is deleted by ycmd during startup
with tempfile.NamedTemporaryFile( delete = False, mode = 'w+' ) as options_file: with NamedTemporaryFile( delete = False, mode = 'w+' ) as options_file:
hmac_secret = os.urandom( HMAC_SECRET_LENGTH ) hmac_secret = os.urandom( HMAC_SECRET_LENGTH )
options_dict = dict( self._user_options ) options_dict = dict( self._user_options )
options_dict[ 'hmac_secret' ] = utils.ToUnicode( options_dict[ 'hmac_secret' ] = utils.ToUnicode(