diff options
| author | efkin <efkin@riseup.net> | 2017-03-13 21:17:18 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-03-17 17:52:57 +0100 |
| commit | 7562655cf4bf28a1ebd6c458334da0c166f34e61 (patch) | |
| tree | 54bc2de9b71e35d56fdcc3dd1ee9642ce8fd491d /testing/test_soledad/u1db_tests | |
| parent | ba3fcb08eafd389bdbf0ab9c59577a25c8d8126d (diff) | |
[refactor] Improve python3 compatibility
With this commit all tests on py34 tox environment
are collected.
Diffstat (limited to 'testing/test_soledad/u1db_tests')
| -rw-r--r-- | testing/test_soledad/u1db_tests/__init__.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/testing/test_soledad/u1db_tests/__init__.py b/testing/test_soledad/u1db_tests/__init__.py index 36db548d..1575b859 100644 --- a/testing/test_soledad/u1db_tests/__init__.py +++ b/testing/test_soledad/u1db_tests/__init__.py @@ -28,12 +28,6 @@ import sys from six import StringIO from wsgiref import simple_server - -if sys.version_info[0] < 3: - from pysqlcipher import dbapi2 -else: - from pysqlcipher3 import dbapi2 - import testscenarios from twisted.trial import unittest from twisted.web.server import Site @@ -48,6 +42,11 @@ from leap.soledad.common.l2db.remote import server_state from leap.soledad.common.l2db.remote import http_app from leap.soledad.common.l2db.remote import http_target +if sys.version_info[0] < 3: + from pysqlcipher import dbapi2 +else: + from pysqlcipher3 import dbapi2 + class TestCase(unittest.TestCase): |