From e581c5c8ab876f02cd7fc8c73a4b91c8511a190f Mon Sep 17 00:00:00 2001
From: micbou <contact@micbou.com>
Date: Sun, 19 Mar 2017 13:58:04 +0100
Subject: [PATCH] Import urljoin and urlparse from ycmd.utils

---
 python/ycm/client/base_request.py | 3 +--
 third_party/ycmd                  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/python/ycm/client/base_request.py b/python/ycm/client/base_request.py
index c8660c65..5b526366 100644
--- a/python/ycm/client/base_request.py
+++ b/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
 
diff --git a/third_party/ycmd b/third_party/ycmd
index e7096293..fc7620a8 160000
--- a/third_party/ycmd
+++ b/third_party/ycmd
@@ -1 +1 @@
-Subproject commit e709629389e7fe524e3c18e6896026956d968d16
+Subproject commit fc7620a8a8b3880726c81b6b4e1789d8d25e38b6