--- a/devtools/httptest.py	Mon Sep 14 12:19:48 2015 +0200
+++ b/devtools/httptest.py	Tue Sep 22 09:39:30 2015 +0200
@@ -26,7 +26,8 @@
 import threading
 import socket
 import httplib
-from urlparse import urlparse
+
+from six.moves.urllib.parse import urlparse
 
 from twisted.internet import reactor, error