diff options
| author | Kali Kaneko <kali@leap.se> | 2014-08-19 11:34:43 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-08-19 11:37:52 -0500 |
| commit | b1125ba0b6526cdf6b18844ba916909d0ca61cc0 (patch) | |
| tree | 570dcd9e7cf1da1e6c6ab1e3f477c3a1deae01d2 /src/leap | |
| parent | 6a0d13351838896094bd168712eaa96b4a63b953 (diff) | |
Revert cherry-pick for soledad imports
...because we're not releasing the newest soledad version yet
(secrets module will appear with soledad 0.6.0)
Diffstat (limited to 'src/leap')
| -rw-r--r-- | src/leap/bitmask/backend/components.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index 89f3c5a6..03fcf0cb 100644 --- a/src/leap/bitmask/backend/components.py +++ b/src/leap/bitmask/backend/components.py @@ -60,7 +60,7 @@ from leap.common import certs as leap_certs from leap.keymanager import openpgp from leap.keymanager.errors import KeyAddressMismatch, KeyFingerprintMismatch -from leap.soledad.client.secrets import NoStorageSecret, PassphraseTooShort +from leap.soledad.client import NoStorageSecret, PassphraseTooShort logger = logging.getLogger(__name__) diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 745645f3..c4e43bfe 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -45,8 +45,7 @@ from leap.common.files import which from leap.keymanager import KeyManager, openpgp from leap.keymanager.errors import KeyNotFound from leap.soledad.common.errors import InvalidAuthTokenError -from leap.soledad.client import Soledad -from leap.soledad.client.secrets import BootstrapSequenceError +from leap.soledad.client import Soledad, BootstrapSequenceError logger = logging.getLogger(__name__) |