summaryrefslogtreecommitdiff
path: root/client/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-08-19 15:22:55 -0400
committerKali Kaneko <kali@leap.se>2015-08-19 15:22:55 -0400
commitee9ab32cd3cbe6a4fa73401a45faff6a36d16acf (patch)
tree671c22cc44591eb3a072e7e49d884a43142a8278 /client/src
parentedf54f4a2c59990c91544614d6014a900a8e3af3 (diff)
[style] pep8 cleanups
Diffstat (limited to 'client/src')
-rw-r--r--client/src/leap/soledad/client/api.py4
-rw-r--r--client/src/leap/soledad/client/encdecpool.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/client/src/leap/soledad/client/api.py b/client/src/leap/soledad/client/api.py
index b91e497f..7afc9c6c 100644
--- a/client/src/leap/soledad/client/api.py
+++ b/client/src/leap/soledad/client/api.py
@@ -222,8 +222,8 @@ class Soledad(object):
soledad_assert_type(self._passphrase, unicode)
def initialize(attr, val):
- return ((getattr(self, attr, None) is None)
- and setattr(self, attr, val))
+ return ((getattr(self, attr, None) is None) and
+ setattr(self, attr, val))
initialize("_secrets_path", os.path.join(
self.default_prefix, self.secrets_file_name))
diff --git a/client/src/leap/soledad/client/encdecpool.py b/client/src/leap/soledad/client/encdecpool.py
index 69b0556b..2ad98767 100644
--- a/client/src/leap/soledad/client/encdecpool.py
+++ b/client/src/leap/soledad/client/encdecpool.py
@@ -136,6 +136,7 @@ class SyncEncryptDecryptPool(object):
"""
return self._sync_db.runQuery(query, *args)
+
def encrypt_doc_task(doc_id, doc_rev, content, key, secret):
"""
Encrypt the content of the given document.
@@ -419,7 +420,6 @@ class SyncDecrypterPool(SyncEncryptDecryptPool):
self._deferred_init = self._init_db()
self._wait_init_db('_runOperation', '_runQuery')
-
def _wait_init_db(self, *methods):
"""
Methods that need to wait for db initialization.