summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-07-03 08:59:14 -0300
committerTomás Touceda <chiiph@leap.se>2013-07-03 08:59:14 -0300
commitb5516cc47b887d989690bde102441726927b84f1 (patch)
tree1271d821c9c6a551aec5e7c41dc72e312244f9b5 /src/leap
parent3364a21d2f38a4d09259221ceef9ab1a48f205f5 (diff)
parent5e477e29ed93ec59bcd402457cebc69c08824c38 (diff)
Merge remote-tracking branch 'drebs/bug/2853-use-latest-soledad-api-2' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/keymanager/openpgp.py2
-rw-r--r--src/leap/services/soledad/soledadbootstrapper.py10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/leap/keymanager/openpgp.py b/src/leap/keymanager/openpgp.py
index 89323117..d19bb2b5 100644
--- a/src/leap/keymanager/openpgp.py
+++ b/src/leap/keymanager/openpgp.py
@@ -604,7 +604,7 @@ class OpenPGPScheme(EncryptionScheme):
:param private: Whether to look for a private key.
:type private: bool
:return: The document with the key or None if it does not exist.
- :rtype: leap.soledad.backends.leap_backend.LeapDocument
+ :rtype: leap.soledad.document.SoledadDocument
"""
doclist = self._soledad.get_from_index(
TAGS_ADDRESS_PRIVATE_INDEX,
diff --git a/src/leap/services/soledad/soledadbootstrapper.py b/src/leap/services/soledad/soledadbootstrapper.py
index 2635a7e6..46e985ad 100644
--- a/src/leap/services/soledad/soledadbootstrapper.py
+++ b/src/leap/services/soledad/soledadbootstrapper.py
@@ -95,11 +95,11 @@ class SoledadBootstrapper(AbstractBootstrapper):
self._soledad = Soledad(uuid,
self._password.encode("utf-8"),
- secrets_path,
- local_db_path,
- server_url,
- cert_file,
- srp_auth.get_token())
+ secrets_path=secrets_path,
+ local_db_path=local_db_path,
+ server_url=server_url,
+ cert_file=cert_file,
+ auth_token=srp_auth.get_token())
self._soledad.sync()
def _download_config(self):