From ba3fcb08eafd389bdbf0ab9c59577a25c8d8126d Mon Sep 17 00:00:00 2001
From: efkin <efkin@riseup.net>
Date: Mon, 13 Mar 2017 20:20:19 +0100
Subject: [test] Prepare tests for python3 compatibility

---
 testing/tests/couch/common.py           | 2 +-
 testing/tests/couch/test_atomicity.py   | 2 +-
 testing/tests/couch/test_backend.py     | 4 ++--
 testing/tests/couch/test_sync.py        | 4 ++--
 testing/tests/couch/test_sync_target.py | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'testing/tests/couch')

diff --git a/testing/tests/couch/common.py b/testing/tests/couch/common.py
index 84790059..3c272f6e 100644
--- a/testing/tests/couch/common.py
+++ b/testing/tests/couch/common.py
@@ -1,5 +1,5 @@
 from uuid import uuid4
-from urlparse import urljoin
+from six.moves.urllib.parse import urljoin
 from couchdb.client import Server
 
 from leap.soledad.common import couch
diff --git a/testing/tests/couch/test_atomicity.py b/testing/tests/couch/test_atomicity.py
index a3ae0314..48e1c01d 100644
--- a/testing/tests/couch/test_atomicity.py
+++ b/testing/tests/couch/test_atomicity.py
@@ -21,7 +21,7 @@ import os
 import pytest
 import threading
 
-from urlparse import urljoin
+from six.moves.urllib.parse import urljoin
 from twisted.internet import defer
 from uuid import uuid4
 
diff --git a/testing/tests/couch/test_backend.py b/testing/tests/couch/test_backend.py
index 4fad11cf..9dfa22ac 100644
--- a/testing/tests/couch/test_backend.py
+++ b/testing/tests/couch/test_backend.py
@@ -19,7 +19,7 @@ Test ObjectStore and Couch backend bits.
 """
 
 from uuid import uuid4
-from urlparse import urljoin
+from six.moves.urllib.parse import urljoin
 from testscenarios import TestWithScenarios
 from twisted.trial import unittest
 
@@ -28,7 +28,7 @@ from leap.soledad.common import couch
 from test_soledad.util import CouchDBTestCase
 from test_soledad.u1db_tests import test_backends
 
-from common import COUCH_SCENARIOS
+from .common import COUCH_SCENARIOS
 
 
 # -----------------------------------------------------------------------------
diff --git a/testing/tests/couch/test_sync.py b/testing/tests/couch/test_sync.py
index bccbfe43..c353518e 100644
--- a/testing/tests/couch/test_sync.py
+++ b/testing/tests/couch/test_sync.py
@@ -8,8 +8,8 @@ from test_soledad.util import CouchDBTestCase
 from test_soledad.util import sync_via_synchronizer
 from test_soledad.u1db_tests import DatabaseBaseTests
 
-from common import simple_doc
-from common import COUCH_SCENARIOS
+from .common import simple_doc
+from .common import COUCH_SCENARIOS
 
 
 sync_scenarios = []
diff --git a/testing/tests/couch/test_sync_target.py b/testing/tests/couch/test_sync_target.py
index e792fb76..0370a6d1 100644
--- a/testing/tests/couch/test_sync_target.py
+++ b/testing/tests/couch/test_sync_target.py
@@ -10,9 +10,9 @@ from test_soledad.util import CouchDBTestCase
 from test_soledad.util import make_local_db_and_target
 from test_soledad.u1db_tests import DatabaseBaseTests
 
-from common import simple_doc
-from common import nested_doc
-from common import COUCH_SCENARIOS
+from .common import simple_doc
+from .common import nested_doc
+from .common import COUCH_SCENARIOS
 
 
 target_scenarios = [
-- 
cgit v1.2.3