summaryrefslogtreecommitdiff
path: root/testing/tests/server
diff options
context:
space:
mode:
authorefkin <efkin@riseup.net>2017-03-13 20:20:19 +0100
committerKali Kaneko <kali@leap.se>2017-03-17 17:52:56 +0100
commitba3fcb08eafd389bdbf0ab9c59577a25c8d8126d (patch)
tree24f41600853a07318a035c5de4fc11f8e10fdd6a /testing/tests/server
parent1034d3107b57f03d7ed2257aef39cede2f6686ef (diff)
[test] Prepare tests for python3 compatibility
Diffstat (limited to 'testing/tests/server')
-rw-r--r--testing/tests/server/test_server.py2
-rw-r--r--testing/tests/server/test_session.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/testing/tests/server/test_server.py b/testing/tests/server/test_server.py
index 4a5ec43f..bc80905e 100644
--- a/testing/tests/server/test_server.py
+++ b/testing/tests/server/test_server.py
@@ -21,7 +21,7 @@ import binascii
import os
import pytest
-from urlparse import urljoin
+from six.moves.urllib.parse import urljoin
from uuid import uuid4
from twisted.internet import defer
diff --git a/testing/tests/server/test_session.py b/testing/tests/server/test_session.py
index ebb94476..1ca34f8a 100644
--- a/testing/tests/server/test_session.py
+++ b/testing/tests/server/test_session.py
@@ -156,7 +156,7 @@ class SoledadSessionTestCase(unittest.TestCase):
return {}
def decode(self, response, request):
- print "decode raised"
+ print("decode raised")
raise UnexpectedException()
self.wrapper._credentialFactory = BadFactory()