Revert of wptserve: Import the latest revision of wptserve-related files.

third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/server.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/server.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/server.py b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/server.py
index 0ab512cb2a5626ca051ee2e755eef205037e7d4c..31929efd6e18937c10454cc68097e8c7ee627490 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/server.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/server.py
@@ -9,8 +9,7 @@
 import time
 import traceback
 import types
-
-from six.moves.urllib.parse import urlsplit, urlunsplit
+import urlparse
 
 from . import routes as default_routes
 from .logger import get_logger
@@ -90,7 +89,7 @@
         :param request_handler: BaseHTTPRequestHandler for which to
                                 rewrite the request.
         """
-        split_url = urlsplit(request_handler.path)
+        split_url = urlparse.urlsplit(request_handler.path)
         if split_url.path in self.rules:
             methods, destination = self.rules[split_url.path]
             if "*" in methods or request_handler.command in methods:
@@ -98,7 +97,7 @@
                              (request_handler.path, destination))
                 new_url = list(split_url)
                 new_url[2] = destination
-                new_url = urlunsplit(new_url)
+                new_url = urlparse.urlunsplit(new_url)
                 request_handler.path = new_url
 
 
@@ -457,6 +456,6 @@
         if not self.started:
             return None
 
-        return urlunsplit(("http" if not self.use_ssl else "https",
-                           "%s:%s" % (self.host, self.port),
-                           path, query, fragment))
+        return urlparse.urlunsplit(("http" if not self.use_ssl else "https",
+                                    "%s:%s" % (self.host, self.port),
+                                    path, query, fragment))