From d3adb3faf112f8fe01c585dd056482479278ddbf Mon Sep 17 00:00:00 2001 From: Matthias Bilger Date: Thu, 11 Sep 2014 07:22:27 +0200 Subject: [PATCH] Append to no_proxy instead of overwrite Overwriting no_proxy may cause some trouble for other plugins using network in environments with proxy exceptions, e.g. vim-fugitive --- python/ycm/youcompleteme.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/ycm/youcompleteme.py b/python/ycm/youcompleteme.py index 0af78fe0..2f9c9153 100644 --- a/python/ycm/youcompleteme.py +++ b/python/ycm/youcompleteme.py @@ -53,7 +53,7 @@ except ImportError: # Relevant issues: # https://github.com/Valloric/YouCompleteMe/issues/641 # https://github.com/kennethreitz/requests/issues/879 -os.environ['no_proxy'] = '127.0.0.1,localhost' +os.environ['no_proxy'] = os.environ['no_proxy'] + (',' if len (os.environ['no_proxy']) > 0 else '') + '127.0.0.1,localhost' # Force the Python interpreter embedded in Vim (in which we are running) to # ignore the SIGINT signal. This helps reduce the fallout of a user pressing