Changeset 10494 for main/waeup.cas/trunk/waeup/cas

Timestamp:

13 Aug 2013, 13:40:01 (11 years ago)

Author:

uli

Message:

Make everything work under Python3.x again.

Location:

main/waeup.cas/trunk/waeup/cas

Files:

• server.py (modified) (2 diffs)
• tests/test_server.py (modified) (3 diffs)

main/waeup.cas/trunk/waeup/cas/server.py

@@ -5 +5 @@
 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 +192 @@
     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)

main/waeup.cas/trunk/waeup/cas/tests/test_server.py

@@ -5 +5 @@
 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 +572 @@
         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 +580 @@
         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')