Import urljoin and urlparse from ycmd.utils

python/ycm/client/base_request.py

@@ -25,11 +25,10 @@ from builtins import *  # noqa
 import contextlib
 import logging
 import json
-from future.moves.urllib.parse import urljoin, urlparse
 from future.utils import native
 from base64 import b64decode, b64encode
 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.responses import ServerError, UnknownExtraConf
 

third_party/ycmd

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