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

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/request.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/request.py b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/request.py
index a7c389601b11fbe22265ee578091df7472dfe097..6b8a7cef86ef2b4f156dc239e61b6375f26b8026 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/request.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/request.py
@@ -3,8 +3,7 @@
 import Cookie
 import StringIO
 import tempfile
-
-from six.moves.urllib.parse import parse_qsl, urlsplit
+import urlparse
 
 from . import stash
 from .utils import HTTPException
@@ -266,7 +265,7 @@
                                       host,
                                       port,
                                       self.request_path)
-        self.url_parts = urlsplit(self.url)
+        self.url_parts = urlparse.urlsplit(self.url)
 
         self._raw_headers = request_handler.headers
 
@@ -291,7 +290,7 @@
     @property
     def GET(self):
         if self._GET is None:
-            params = parse_qsl(self.url_parts.query, keep_blank_values=True)
+            params = urlparse.parse_qsl(self.url_parts.query, keep_blank_values=True)
             self._GET = MultiDict()
             for key, value in params:
                 self._GET.add(key, value)