diff options
author | Kali Kaneko <kali@leap.se> | 2013-09-12 14:08:50 +0200 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-09-16 16:10:53 -0400 |
commit | 71538bac28132a970ba5cf8f5ba94548c8cac7c0 (patch) | |
tree | 7f3495aa3ebf0cf69ba995f59f94b7409052f052 /client/src/leap/soledad | |
parent | 57b7edf98116fee5d231a18ce903e3ef6c68a1da (diff) |
reorder imports
Diffstat (limited to 'client/src/leap/soledad')
-rw-r--r-- | client/src/leap/soledad/client/__init__.py | 17 |
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 # |