Fix deprecation warnings for cgi.parse_qs() and cgi.parse_qsl()

supervisor/tests/test_web.py::UIHandlerTests::test_handle_request_tail_html
  /home/travis/build/Supervisor/supervisor/supervisor/web.py:623: PendingDeprecationWarning: cgi.parse_qs is deprecated, use urlparse.parse_qs instead
    query_data = parse_qs(query)

supervisor/tests/test_web.py::UIHandlerTests::test_handle_request_tail_html
  /home/travis/build/Supervisor/supervisor/supervisor/web.py:622: PendingDeprecationWarning: cgi.parse_qsl is deprecated, use urlparse.parse_qsl instead
    form_urlencoded = parse_qsl(data)

(cherry picked from commit 9cfa816)

Author: mnaberez

supervisor/compat.py

@@ -108,17 +108,7 @@ def syslog(*args):
 except ImportError:  # pragma: no cover
     from sys import maxsize as maxint
 
-try:  # pragma: no cover
-    from urllib.parse import parse_qs, parse_qsl
-except ImportError:  # pragma: no cover
-    from urlparse import parse_qs, parse_qsl
-
-try:  # pragma: no cover
-    from urllib.parse import unquote, splitquery
-except ImportError:
-    from urllib import unquote, splitquery
-
-try:  # pragma: no cover
+try: # pragma: no cover
     import http.client as httplib
 except ImportError:  # pragma: no cover
     import httplib

supervisor/web.py

@@ -8,10 +8,9 @@
 
 import meld3
 
-from supervisor.compat import urllib
-from supervisor.compat import parse_qs
-from supervisor.compat import parse_qsl
 from supervisor.compat import as_bytes
+from supervisor.compat import urllib
+from supervisor.compat import urlparse
 from supervisor.compat import as_string
 from supervisor.compat import PY2
 from supervisor.compat import unicode
@@ -611,8 +610,8 @@ def continue_request(self, data, request):
         query = form['QUERY_STRING']
 
         # we only handle x-www-form-urlencoded values from POSTs
-        form_urlencoded = parse_qsl(data)
-        query_data = parse_qs(query)
+        form_urlencoded = urlparse.parse_qsl(data)
+        query_data = urlparse.parse_qs(query)
 
         for k, v in query_data.items():
             # ignore dupes