summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-09-16 17:14:27 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-09-16 17:14:27 -0300
commit710130799a2a843309be0306862780f0f108b5dd (patch)
tree7f3495aa3ebf0cf69ba995f59f94b7409052f052 /client
parent57b7edf98116fee5d231a18ce903e3ef6c68a1da (diff)
parent71538bac28132a970ba5cf8f5ba94548c8cac7c0 (diff)
Merge remote-tracking branch 'kali/feature/reorder_scrypt_import' into develop
Diffstat (limited to 'client')
-rw-r--r--client/src/leap/soledad/client/__init__.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py
index c6fbeac4..0976d346 100644
--- a/client/src/leap/soledad/client/__init__.py
+++ b/client/src/leap/soledad/client/__init__.py
@@ -14,8 +14,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
"""
Soledad - Synchronization Of Locally Encrypted Data Among Devices.
@@ -25,22 +23,23 @@ implements (1) a SQLCipher backend for local storage in the client, (2) a
SyncTarget that encrypts data before syncing, and (3) a CouchDB backend for
remote storage in the server side.
"""
-
-import os
import binascii
-import logging
-import urlparse
-import simplejson as json
-import scrypt
+import errno
import httplib
+import logging
+import os
import socket
import ssl
-import errno
+import urlparse
from hashlib import sha256
+
from u1db.remote import http_client
from u1db.remote.ssl_match_hostname import match_hostname
+import scrypt
+import simplejson as json
+
from leap.common.config import get_path_prefix
#