diff options
Diffstat (limited to 'testing/tests/conftest.py')
| -rw-r--r-- | testing/tests/conftest.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |