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

Auto merge of #2578 - micbou:urllib-compatibility, r=Valloric

Browse Source 
[READY] Import urljoin and urlparse from ycmd.utils

See https://github.com/Valloric/ycmd/pull/724. This also fixes a regression in startup time on Python 3 because importing `futures.moves` was calling [the `import_top_level_modules` function](https://github.com/PythonCharmers/python-future/blob/master/src/future/moves/__init__.py#L7-L8) which is slow.

Fixes https://github.com/Valloric/YouCompleteMe/issues/2577.

<!-- 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/2578)
<!-- Reviewable:end -->
This commit is contained in:
Homu 2017-03-21 05:46:15 +09:00
commit 32ea947dd0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/ycm/client/base_request.py
View File

@ -25,11 +25,10 @@ from builtins import * # noqa
import contextlib import contextlib
import logging import logging
import json import json
from future.moves.urllib.parse import urljoin, urlparse
from future.utils import native from future.utils import native
from base64 import b64decode, b64encode from base64 import b64decode, b64encode
from ycm import vimsupport from ycm import vimsupport
from ycmd.utils import ToBytes from ycmd.utils import ToBytes, urljoin, urlparse
from ycmd.hmac_utils import CreateRequestHmac, CreateHmac, SecureBytesEqual from ycmd.hmac_utils import CreateRequestHmac, CreateHmac, SecureBytesEqual
from ycmd.responses import ServerError, UnknownExtraConf from ycmd.responses import ServerError, UnknownExtraConf

2
third_party/ycmd vendored

@ -1 +1 @@
Subproject commit e709629389e7fe524e3c18e6896026956d968d16 Subproject commit fc7620a8a8b3880726c81b6b4e1789d8d25e38b6