--- a/etwist/server.py	Mon Sep 14 12:19:48 2015 +0200
+++ b/etwist/server.py	Tue Sep 22 09:39:30 2015 +0200
@@ -22,8 +22,10 @@
 import select
 import traceback
 import threading
-from urlparse import urlsplit, urlunsplit
 from cgi import FieldStorage, parse_header
+
+from six.moves.urllib.parse import urlsplit, urlunsplit
+
 from cubicweb.statsd_logger import statsd_timeit
 
 from twisted.internet import reactor, task, threads