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 /client/src/leap/soledad/client/api.py | |
parent | ba3fcb08eafd389bdbf0ab9c59577a25c8d8126d (diff) |
[refactor] Improve python3 compatibility
With this commit all tests on py34 tox environment
are collected.
Diffstat (limited to 'client/src/leap/soledad/client/api.py')
-rw-r--r-- | client/src/leap/soledad/client/api.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/client/src/leap/soledad/client/api.py b/client/src/leap/soledad/client/api.py index c8c3ce30..3b17f188 100644 --- a/client/src/leap/soledad/client/api.py +++ b/client/src/leap/soledad/client/api.py @@ -27,20 +27,19 @@ remote storage in the server side. """ import binascii import errno -import httplib import os import socket import ssl import uuid -import urlparse from itertools import chain - -from StringIO import StringIO +import six.moves.http_client as httplib +import six.moves.urllib.parse as urlparse +from six import StringIO from collections import defaultdict from twisted.internet import defer -from zope.interface import implements +from zope.interface import implementer from leap.common.config import get_path_prefix from leap.common.plugins import collect_plugins @@ -79,6 +78,9 @@ Soledad client and server. SOLEDAD_CERT = None +@implementer(soledad_interfaces.ILocalStorage, + soledad_interfaces.ISyncableStorage, + soledad_interfaces.ISecretsStorage) class Soledad(object): """ Soledad provides encrypted data storage and sync. @@ -111,9 +113,6 @@ class Soledad(object): there's indeed new data to be synchronized between local database replica and server's replica. --- not used right now. """ - implements(soledad_interfaces.ILocalStorage, - soledad_interfaces.ISyncableStorage, - soledad_interfaces.ISecretsStorage) local_db_file_name = 'soledad.u1db' secrets_file_name = "soledad.json" |