From ba3fcb08eafd389bdbf0ab9c59577a25c8d8126d Mon Sep 17 00:00:00 2001 From: efkin Date: Mon, 13 Mar 2017 20:20:19 +0100 Subject: [test] Prepare tests for python3 compatibility --- testing/tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing/tests/conftest.py') diff --git a/testing/tests/conftest.py b/testing/tests/conftest.py index c077828f..589cb7de 100644 --- a/testing/tests/conftest.py +++ b/testing/tests/conftest.py @@ -7,7 +7,7 @@ import time from hashlib import sha512 from subprocess import check_call -from urlparse import urljoin +from six.moves.urllib.parse import urljoin from uuid import uuid4 from leap.soledad.common.couch import CouchDatabase -- cgit v1.2.3