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/test_soledad/util.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'testing/test_soledad/util.py') diff --git a/testing/test_soledad/util.py b/testing/test_soledad/util.py index 83a27016..91291faf 100644 --- a/testing/test_soledad/util.py +++ b/testing/test_soledad/util.py @@ -24,12 +24,17 @@ import random import string import couchdb import pytest +import sys +from six.moves.urllib.parse import urljoin +from six import StringIO from uuid import uuid4 from mock import Mock -from urlparse import urljoin -from StringIO import StringIO -from pysqlcipher import dbapi2 + +if sys.version_info[0] < 3: + from pysqlcipher import dbapi2 +else: + from pysqlcipher3 import dbapi2 from twisted.trial import unittest -- cgit v1.2.3