Index: /main/waeup.cas/trunk/waeup/cas/server.py
===================================================================
--- /main/waeup.cas/trunk/waeup/cas/server.py	(revision 10493)
+++ /main/waeup.cas/trunk/waeup/cas/server.py	(revision 10494)
@@ -5,6 +5,12 @@
 import random
 import time
-import urllib
-from urlparse import urlparse, parse_qsl, urlunparse
+try:
+    from urllib import urlencode        # Python 2.x
+except ImportError:                     # pragma: no cover
+    from urllib.parse import urlencode  # Python 3.x
+try:
+    from urlparse import urlparse, parse_qsl, urlunparse       # Python 2.x
+except ImportError:                                     # pragma: no cover
+    from urllib.parse import urlparse, parse_qsl, urlunparse  # Python 3.x
 from webob import exc, Response
 from webob.dec import wsgify
@@ -186,5 +192,5 @@
     old_params = dict(parse_qsl(parts[4]))
     old_params.update(params_dict)
-    query_string = urllib.urlencode(old_params)
+    query_string = urlencode(old_params)
     parts[4] = query_string
     return urlunparse(parts)
Index: /main/waeup.cas/trunk/waeup/cas/tests/test_server.py
===================================================================
--- /main/waeup.cas/trunk/waeup/cas/tests/test_server.py	(revision 10493)
+++ /main/waeup.cas/trunk/waeup/cas/tests/test_server.py	(revision 10494)
@@ -5,5 +5,8 @@
 import unittest
 from paste.deploy import loadapp
-from urlparse import parse_qsl
+try:
+    from urlparse import parse_qsl         # Python 2.x
+except ImportError:                        # pragma: no cover
+    from urllib.parse import parse_qsl     # Python 3.x
 from webob import Request, Response
 from webtest import TestApp as WebTestApp  # avoid py.test skip message
@@ -569,5 +572,7 @@
         url = 'http://sample.com/index?a=1&b=2'
         result1 = update_url('http://sample.com/index?a=1&b=2', dict(b='3'))
-        assert result1 == 'http://sample.com/index?a=1&b=3'
+        assert result1 in (
+            'http://sample.com/index?a=1&b=3',
+            'http://sample.com/index?b=3&a=1')
         result2 = update_url('http://sample.com/index?b=2', dict(b='3'))
         assert result2 == 'http://sample.com/index?b=3'
@@ -575,3 +580,5 @@
         assert result3 == 'http://sample.com/index?b=3'
         result4 = update_url('http://sample.com/index?a=2', dict(b='3'))
-        assert result4 == 'http://sample.com/index?a=2&b=3'
+        assert result4 in (
+            'http://sample.com/index?a=2&b=3',
+            'http://sample.com/index?b=3&a=2')
