Merge tag '0.9.2' into debian/platform-0.9

Tag version 0.9.2

4 files changed, 8 insertions, 11 deletions

diff --git a/scripts/db_access/client_side_db.py b/scripts/db_access/client_side_db.py
index 11d72791..48eec0f7 100644
--- a/scripts/db_access/client_side_db.py
+++ b/scripts/db_access/client_side_db.py
@@ -1,13 +1,13 @@
 #!/usr/bin/python
 
 import os
+import sys
 import argparse
 import tempfile
 import getpass
 import requests
 import srp._pysrp as srp
 import binascii
-import logging
 import json
 import time
 
@@ -15,6 +15,7 @@ from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks
 
 from leap.soledad.client import Soledad
+from leap.soledad.common.log import getLogger
 from leap.keymanager import KeyManager
 from leap.keymanager.openpgp import OpenPGPKey
 
@@ -39,9 +40,9 @@ Use the --help option to see available options.
 
 
 # create a logger
-logger = logging.getLogger(__name__)
-LOG_FORMAT = '%(asctime)s %(message)s'
-logging.basicConfig(format=LOG_FORMAT, level=logging.DEBUG)
+logger = getLogger(__name__)
+from twisted.python import log
+log.startLogging(sys.stdout)
 
 
 safe_unhexlify = lambda x: binascii.unhexlify(x) if (
@@ -133,8 +134,7 @@ def _get_soledad_instance(uuid, passphrase, basedir, server_url, cert_file,
         local_db_path=local_db_path,
         server_url=server_url,
         cert_file=cert_file,
-        auth_token=token,
-        defer_encryption=True)
+        auth_token=token)
 
 
 def _get_keymanager_instance(username, provider, soledad, token,
diff --git a/scripts/docker/files/bin/client_side_db.py b/scripts/docker/files/bin/client_side_db.py
index 4be33d13..80da7392 100644
--- a/scripts/docker/files/bin/client_side_db.py
+++ b/scripts/docker/files/bin/client_side_db.py
@@ -136,8 +136,7 @@ def _get_soledad_instance(uuid, passphrase, basedir, server_url, cert_file,
         local_db_path=local_db_path,
         server_url=server_url,
         cert_file=cert_file,
-        auth_token=token,
-        defer_encryption=True)
+        auth_token=token)
 
 
 def _get_keymanager_instance(username, provider, soledad, token,
diff --git a/scripts/profiling/mail/soledad_client.py b/scripts/profiling/mail/soledad_client.py
index 5ac8ce39..dcd605aa 100644
--- a/scripts/profiling/mail/soledad_client.py
+++ b/scripts/profiling/mail/soledad_client.py
@@ -30,8 +30,7 @@ class SoledadClient(object):
             server_url=self._server_url,
             cert_file=None,
             auth_token=self._auth_token,
-            secret_id=None,
-            defer_encryption=True)
+            secret_id=None)
 
     def close(self):
         if self._soledad is not None:
diff --git a/scripts/profiling/sync/profile-sync.py b/scripts/profiling/sync/profile-sync.py
index 34e66f03..1d59217a 100755
--- a/scripts/profiling/sync/profile-sync.py
+++ b/scripts/profiling/sync/profile-sync.py
@@ -91,7 +91,6 @@ def _get_soledad_instance_from_uuid(uuid, passphrase, basedir, server_url,
         server_url=server_url,
         cert_file=cert_file,
         auth_token=token,
-        defer_encryption=True,
         syncable=True)