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/test_soledad/util.py | |
parent | 1034d3107b57f03d7ed2257aef39cede2f6686ef (diff) |
[test] Prepare tests for python3 compatibility
Diffstat (limited to 'testing/test_soledad/util.py')
-rw-r--r-- | testing/test_soledad/util.py | 11 |
1 files changed, 8 insertions, 3 deletions
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 |