diff options
| author | efkin <efkin@riseup.net> | 2017-03-13 20:20:19 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-03-17 17:52:56 +0100 |
| commit | ba3fcb08eafd389bdbf0ab9c59577a25c8d8126d (patch) | |
| tree | 24f41600853a07318a035c5de4fc11f8e10fdd6a /testing/tests/conftest.py | |
| parent | 1034d3107b57f03d7ed2257aef39cede2f6686ef (diff) | |
[test] Prepare tests for python3 compatibility
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 |