make test fails on python3.5 with error ImportError: No module named urlparse

lib/disco/compat.py

@@ -32,6 +32,7 @@ def force_ascii(string):
 
     import socketserver as socket_server
     from urllib.parse import urlencode
+    from urllib.parse import urlparse
     import http.client as httplib
     import http.server as http_server
 
@@ -76,6 +77,7 @@ def force_ascii(string):
 
     import SocketServer as socket_server
     from urllib import urlencode
+    from urlparse import urlparse
     import httplib as httplib
     import BaseHTTPServer as http_server
 

lib/disco/util.py

@@ -7,7 +7,6 @@
 """
 import os, sys, time
 import functools, gzip
-from urlparse import urlparse
 
 from disco.compat import BytesIO, basestring, bytes_to_str, str_to_bytes
 from disco.compat import pickle_loads, pickle_dumps, sort_cmd