diff options
Diffstat (limited to 'tests/conftest.py')
| -rw-r--r-- | tests/conftest.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 3eef674d..645836a1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -11,10 +11,10 @@ import socket import subprocess import sys import time -import urlparse from hashlib import sha512 from six.moves.urllib.parse import urljoin +from six.moves.urllib.parse import urlsplit from uuid import uuid4 from leap.soledad.common.couch import CouchDatabase @@ -117,7 +117,7 @@ def _request(method, url, data=None, do=True): cmd = 'curl --netrc -X %s %s' % (method.upper(), url) if data: cmd += ' -d "%s"' % json.dumps(data) - print cmd + print(cmd) @pytest.fixture @@ -302,7 +302,7 @@ def soledad_dbs(request): def _get_certfile(url, tmpdir): # download the certificate - parsed = urlparse.urlsplit(url) + parsed = urlsplit(url) netloc = re.sub('^[^\.]+\.', '', parsed.netloc) host, _ = netloc.split(':') response = requests.get('https://%s/ca.crt' % host, verify=False) |