diff options
| author | drebs <drebs@leap.se> | 2013-06-17 15:49:39 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-07-02 14:11:26 -0300 |
| commit | a45635b23dfbfc538dd9a23b409f9cb44ba59ec7 (patch) | |
| tree | 58b0ef671e35570a13b22ea8962b51d6d69d370e /src | |
| parent | d4712e75ff14d0f05b53221d39799d7648d5253f (diff) | |
Adapt Soledad bits to latest API.
Diffstat (limited to 'src')
| -rw-r--r-- | src/leap/keymanager/openpgp.py | 2 | ||||
| -rw-r--r-- | src/leap/services/soledad/soledadbootstrapper.py | 10 |
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): |